diff --git a/profiles/laptop/.config/polybar/config b/profiles/laptop/.config/polybar/config
index 47ce559..21127ca 100644
--- a/profiles/laptop/.config/polybar/config
+++ b/profiles/laptop/.config/polybar/config
@@ -6,12 +6,19 @@ include-file = ~/.config/polybar/config.d/base_bar
 
 [bar/laptop]
 inherit = bar/base
-monitor = ${env:MONITOR:eDP-1}
+monitor = ${env:MONITOR:}
 
 modules-left = i3 xwindow 
 modules-right = previous playpause next spotify pulseaudio cpu memory battery1 date
 
+tray-position = right
+tray-padding = 2
 
-[bar/laptop_extern]
-inherit = bar/laptop
-monitor = ${env:MONITOR:HDMI-2}
+[bar/laptop_secondary]
+inherit = bar/base
+monitor = ${env:MONITOR:}
+
+modules-left = i3 xwindow 
+modules-right = previous playpause next spotify pulseaudio cpu memory battery1 date
+
+tray-position = none
diff --git a/profiles/laptop/.config/polybar/polybar.sh b/profiles/laptop/.config/polybar/polybar.sh
index eb5b7a1..9fd6fdb 100755
--- a/profiles/laptop/.config/polybar/polybar.sh
+++ b/profiles/laptop/.config/polybar/polybar.sh
@@ -5,8 +5,19 @@ killall -q polybar
 # Wait until the processes have been shut down
 while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
-# Launch bar1 and bar2
-polybar -c ~/.config/polybar/config laptop &
-polybar -c ~/.config/polybar/config laptop_extern &
+if type "xrandr"; then
+  # primary screen
+  for m in $(xrandr --query | grep " connected" | grep "primary" | cut -d" " -f1); do
+    MONITOR=$m polybar --reload laptop &
+  done
+  # other screens
+  for m in $(xrandr --query | grep " connected" | grep -v "primary" | cut -d" " -f1); do
+    MONITOR=$m polybar --reload laptop_secondary &
+  done
+else
+  polybar --reload laptop &
+fi
+# polybar -c ~/.config/polybar/config laptop &
+# polybar -c ~/.config/polybar/config laptop_extern &
 
 echo "Bars launched..."
diff --git a/profiles/shared/.config/i3/config b/profiles/shared/.config/i3/config
index 9bd7ec4..c73d3ff 100644
--- a/profiles/shared/.config/i3/config
+++ b/profiles/shared/.config/i3/config
@@ -71,8 +71,8 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # move workspace left/right
-bindsym $mod+Shift+greater move workspace to output left
-bindsym $mod+Shift+less move workspace to output right
+bindsym $mod+Shift+greater move workspace to output right
+bindsym $mod+Shift+less move workspace to output left
 
 # split in horizontal orientation
 bindsym $mod+h split h
@@ -173,8 +173,8 @@ bindsym $mod+r mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 #bar {
-#	position top
-#       status_command i3blocks -c ~/.i3/i3blocks.conf
+	#position top
+    #   status_command  2> /tmp/i3blocks.err  i3blocks -c ~/.config/i3/i3blocks.conf | tee /tmp/i3blocks.out
 #}
 
 
@@ -189,19 +189,19 @@ exec_always --no-startup-id ~/.config/polybar/polybar.sh
 # worksapce8 => chat
 # workspace9 => emailing
 # workspace0 => music
-workspace $workspace7 output DP-0 
+workspace $workspace7 output eDP-1 
 assign [class="Zotero"] → $workspace7
 assign [class="Mendeley"] → $workspace7
 
-workspace $workspace8 output DP-0 
+workspace $workspace8 output eDP-1
 assign [class="Skype" title="Skype"] → $workspace8
 assign [class="Mattermost" instance="mattermost"] → $workspace8
+assign [class="Rambox" instance="rambox"] → $workspace8
 
-workspace $workspace9 output DP-0 
+workspace $workspace9 output eDP-1 
 assign [class="thunderbird"] → $workspace9
 
-workspace $workspace10 output DP-0 
-for_window [class="Spotify"] move to workspace $workspace10
+workspace $workspace10 output eDP-1 
 assign [class="Spotify"] → $workspace10
 
 for_window [window_role="pop-up"] floating enable
@@ -210,18 +210,8 @@ for_window [class="Tk"] floating enable
 for_window [title="PyMOL Viewer"] floating enable
 for_window [class="Toplevel"] floating enable
 for_window [title="VMD*"] floating enable
-for_window [title="Area per Lipid*"] floating enable
-for_window [title="MEMBPLUGIN"] floating enable
-#for_window [title="Figure*"] floating enable
+for_window [title="Figure*" instance="matplotlib"] floating enable
 for_window [window_role="conversation" class="Pidgin"] floating enable
-exec --no-startup-id thunderbird
-
-
-
-exec feh --bg-fill /home/bauer/artistic/artistici2.png
-#exec volumeicon
-exec thunar --daemon
-#exec --no-startup-id xautolock -time 5 -locker 'i3lock -i ~/.lockscreen/`ls /home/bauer/lockscreens | shuf -n 1` -t -f'
 
 # Pulse Audio controls
 bindsym --release XF86AudioLowerVolume exec --no-startup-id amixer  sset Master 5%- #decrease sound volume
@@ -246,10 +236,12 @@ bindsym $mod+Shift+s exec --no-startup-id ~/.config/i3/scripts/change_monitor.sh
 
 # reload workspace layouts
 #exec --no-startup-id "i3-msg 'workspace 9; append_layout /home/bauer/.i3/workspace-9.json'"
-
-exec --no-startup-id skypeforlinux
-exec --no-startup-id mattermost-desktop
-exec --no-startup-id nextcloud 
-exec --no-startup-id nm-applet
-exec --no-startup-id xfsettingsd --sm-client-disable &
-exec --no-startup-id /usr/bin/blueman-applet
+#exec feh --bg-fill /home/bauer/artistic/artistici2.png
+#exec --no-startup-id xautolock -time 5 -locker 'i3lock -i ~/.lockscreen/`ls /home/bauer/lockscreens | shuf -n 1` -t -f'
+#exec --no-startup-id thunderbird
+#exec --no-startup-id skypeforlinux
+#exec --no-startup-id mattermost-desktop
+#exec --no-startup-id nextcloud 
+#exec --no-startup-id nm-applet
+#exec --no-startup-id xfsettingsd --sm-client-disable &
+#exec --no-startup-id /usr/bin/blueman-applet
diff --git a/profiles/shared/.config/polybar/config.d/base_bar b/profiles/shared/.config/polybar/config.d/base_bar
index e24b8b6..5ba1901 100644
--- a/profiles/shared/.config/polybar/config.d/base_bar
+++ b/profiles/shared/.config/polybar/config.d/base_bar
@@ -14,9 +14,6 @@ padding-right=2
 module-margin-left=1
 module-margin-right=3
 
-tray-position = right
-tray-padding = 2
-
 font-0 = "Noto Sans:size=14:style=Regular;1"
 font-1 = unifont:fontformat=truetype:size=14:antialias=false;0
 font-2 = FontAwesome:size=14;0
\ No newline at end of file
diff --git a/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings b/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings
index 079240a..104b920 100644
--- a/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings	
+++ b/profiles/shared/.config/sublime-text-3/Packages/User/Package Control.sublime-settings	
@@ -5,6 +5,7 @@
 	],
 	"installed_packages":
 	[
+		"Anaconda",
 		"bioSyntax",
 		"Color Convert",
 		"Color Highlight",
@@ -14,6 +15,7 @@
 		"gruvbox",
 		"Helium",
 		"Incomprehensible Ex",
+		"INI",
 		"LaTeX Snippets",
 		"LaTeXTools",
 		"LSP",
diff --git a/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings b/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
index a667bd0..6dfbb5f 100644
--- a/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
+++ b/profiles/shared/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
@@ -12,7 +12,7 @@
 	"detect_indentation": false,
 	"dictionary": "Packages/Language - English/en_US.dic",
 	"font_face": "Hack for Powerline Regular",
-	"font_size": 15,
+	"font_size": 12,
 	"hot_exit": false,
 	"ignored_packages":
 	[