diff --git a/profiles/base/.aliases b/profiles/base/.aliases
index 88cdc5e..f70437d 100644
--- a/profiles/base/.aliases
+++ b/profiles/base/.aliases
@@ -5,5 +5,12 @@ fi
 alias clip='xsel --clipboard'
 alias groclean='rm \#*'
 alias sm='snakemake'
-alias ls='ls -lh'
+alias ls='ls --color=auto -lh'
 alias workon='source activate' # enable anaconda environ
+alias cwl="cwl-runner"
+
+# lhr
+alias squeue="ssh lcluster11 squeue"
+alias csum="ssh lcluster11 csum"
+alias csreport="ssh lcluster11 csreport"
+alias scancel="ssh lcluster11 scancel"
diff --git a/profiles/base/.condarc b/profiles/base/.condarc
new file mode 100644
index 0000000..6114561
--- /dev/null
+++ b/profiles/base/.condarc
@@ -0,0 +1,7 @@
+channel_priority: strict
+channels:
+  - spyder-ide
+  - conda-forge
+  - bioconda
+  - defaults
+  - salilab
\ No newline at end of file
diff --git a/profiles/base/.config/matplotlib/matplotlibrc b/profiles/base/.config/matplotlib/matplotlibrc
index 3529c3f..cff748f 100644
--- a/profiles/base/.config/matplotlib/matplotlibrc
+++ b/profiles/base/.config/matplotlib/matplotlibrc
@@ -397,7 +397,7 @@ legend.fontsize      : 10
 #figure.titlesize : large      # size of the figure title (Figure.suptitle())
 #figure.titleweight : normal   # weight of the figure title
 figure.figsize   : 11,4.5   # figure size in inches
-figure.dpi       : 100      # figure dots per inch
+figure.dpi       : 300      # figure dots per inch
 #figure.facecolor : white   # figure facecolor; 0.75 is scalar gray
 # figure.edgecolor : white   # figure edgecolor
 figure.autolayout : True  # When True, automatically adjust subplot
diff --git a/profiles/base/.tmux.conf b/profiles/base/.tmux.conf
index d993e80..31c09bc 100644
--- a/profiles/base/.tmux.conf
+++ b/profiles/base/.tmux.conf
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 set-window-option -g xterm-keys on
 set -s escape-time 10 # faster command timeout
 set -g history-limit 10000 
 
 set -g status-interval 10
+=======
+set-option -g mouse on
+
+# make scrolling with wheels work
+bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
+bind -n WheelDownPane select-pane -t= \; send-keys -M
+>>>>>>> 1f76fd836f0ef1b53fc69ba45322da6824c50465
diff --git a/profiles/base/.vimrc b/profiles/base/.vimrc
index 9fd5db4..7303fbc 100644
--- a/profiles/base/.vimrc
+++ b/profiles/base/.vimrc
@@ -32,7 +32,7 @@ Plugin 'morhetz/gruvbox'
 let g:vim_markdown_folding_disabled = 1
 
 let g:pymode_python = "python3"
-let g:pymode_virtualenv_path = "conda"
+let g:pymode_virtualenv_path = "/home/bauer/conda"
 let g:pymode = 1
 let g:pymode_options = 1
 " All of your Plugins must be added before the following line
diff --git a/profiles/base/.zshrc b/profiles/base/.zshrc
index a47fb95..b0414e2 100644
--- a/profiles/base/.zshrc
+++ b/profiles/base/.zshrc
@@ -1,6 +1,5 @@
 export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim
 [[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh 
-
 # source $HOME/bin/antigen.zsh
 # antigen init $HOME/.antigenrc
 
diff --git a/profiles/desktop/.config/i3/config b/profiles/desktop/.config/i3/config
index 4a8326b..ec8c9f0 100644
--- a/profiles/desktop/.config/i3/config
+++ b/profiles/desktop/.config/i3/config
@@ -234,7 +234,8 @@ bindsym XF86HomePage exec "i3lock -i ~/lockscreens/`ls ~/lockscreens | shuf -n 1
 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 "i3-msg 'workspace 9; append_layout /home/bauer/.i3/workspace-9.json'"
 
 exec --no-startup-id nm-applet
 exec --no-startup-id xfsettingsd
+exec --no-startup-id /usr/bin/blueman-applet
\ No newline at end of file
diff --git a/profiles/desktop/.config/polybar/config b/profiles/desktop/.config/polybar/config
index 089fea4..4d1c2dc 100644
--- a/profiles/desktop/.config/polybar/config
+++ b/profiles/desktop/.config/polybar/config
@@ -48,12 +48,13 @@ font-2 = FontAwesome:size=14;0
 [bar/laptop_station]
 inherit = bar/laptop
 monitor = ${env:MONITOR:HDMI-2}
+
 [bar/workstation]
 inherit = bar/base
 monitor = ${env:MONITOR:DP-2}
 modules-left = i3 xwindow
 modules-right = spotify mpd volume filesystem cpu gpu memory date 
-tray-position = right
+tray-position = false
 tray-padding = 2
 
 font-0 = "Noto Sans:size=11:style=Regular;1"
@@ -63,7 +64,7 @@ font-2 = FontAwesome:size=11;0
 [bar/workstation2]
 inherit = bar/workstation
 monitor = ${env:MONITOR:DP-4}
-tray-position = false
+tray-position = right
 
 
 [module/xwindow]
diff --git a/profiles/pymol/.pymolrc b/profiles/pymol/.pymolrc
index d6cd435..781477a 100644
--- a/profiles/pymol/.pymolrc
+++ b/profiles/pymol/.pymolrc
@@ -25,8 +25,6 @@ set spec_reflect, 0.25
 set antialias, 1
 set surface_quality, 1
 set ray_trace_mode, 0
-]
-
 
 # hide nonbonded and nbsphreres
 set nonbonded_transparency, 1
@@ -42,6 +40,8 @@ set cartoon_side_chain_helper, 1
 set cartoon_discrete_colors, on
 set cartoon_highlight_color, gray
 
+# spheres
+set sphere_scale, 0.5
 
 # shortcuts
 set_key F1, toggle sticks, solvent