diff --git a/bash/scriptlets/aliases b/bash/scriptlets/aliases
index 3296d10..cc4e9d9 100644
--- a/bash/scriptlets/aliases
+++ b/bash/scriptlets/aliases
@@ -11,8 +11,10 @@ if [ -x /usr/bin/dircolors ]; then
 fi
 
 # some more ls aliases
-alias ll='ls -l'
+alias l.='ls -d *'
+alias ll='ls -l --si -v --group-directories-first'
 alias la='ls -A'
+alias lla='ll -A'
 alias l='ls -CF'
 
 # Use vim if possible instead of vi
@@ -29,3 +31,7 @@ alias pc='python -ic "from __future__ import division; from math import *"'
 # Moving around
 alias ~='cd ~'
 alias ..='cd ..'
+
+# Computer control
+alias blank='xset dpms force off'
+alias lock='blank; xscreensaver-command --lock'
diff --git a/bash/scriptlets/dropbox b/bash/scriptlets/dropbox
new file mode 100644
index 0000000..5357453
--- /dev/null
+++ b/bash/scriptlets/dropbox
@@ -0,0 +1,5 @@
+# Run the dropbox daemon in the background
+if [ -x "$HOST/.dropbox-dist/dropboxd" ]
+then
+	"$HOST/.dropbox-dist/dropboxd" & alias killDropbox='kill $!'
+fi
diff --git a/bash/scriptlets/fortune b/bash/scriptlets/fortune
index 0fcae1b..21b8679 100644
--- a/bash/scriptlets/fortune
+++ b/bash/scriptlets/fortune
@@ -1,3 +1,10 @@
-if [[ $(command -v fortune) ]]; then
-	fortune -so
+# Give a fortune cookie
+if [[ $(command -v fortune) ]]
+then
+	if [[ $(command -v cowsay) ]]
+	then
+		fortune -so | cowsay -n
+	else
+		fortune -so
+	fi
 fi
diff --git a/bash/scriptlets/iraf b/bash/scriptlets/iraf
new file mode 100644
index 0000000..1a9cbce
--- /dev/null
+++ b/bash/scriptlets/iraf
@@ -0,0 +1,4 @@
+# Add iraf setup commands
+if [ -e /home/ericteunis/.iraf/setup.sh ]; then
+    source /home/ericteunis/.iraf/setup.sh
+fi
diff --git a/bash/scriptlets/ps1 b/bash/scriptlets/ps1
index c8b35e6..5bf43b8 100644
--- a/bash/scriptlets/ps1
+++ b/bash/scriptlets/ps1
@@ -67,15 +67,13 @@ function __prompt_command() {
 	PS1+="@"
 
 	if color ; then
-		if [[ $HOSTNAME == 'fatserf' ]]; then
-			PS1+="${Pur}\H${RCol}"
-		elif [[ $HOSTNAME == 'lilo'* ]];  then
-			PS1+="${BWhi}\H${RCol}"
-		elif [[ $HOSTNAME == 'hg'* ]]; then
-			PS1+="${BRed}\H${RCol}"
-		else
-			PS1+="${Blu}${On_Whi}\H${RCol}"
-		fi
+		case "$HOSTNAME" in
+			'beatmaker')	PS1+="${Gre}\H${RCol}";;
+			'fatserf')	PS1+="${Pur}\H${RCol}";;
+			'lilo'*)	PS1+="${BWhi}\H${RCol}";;
+			'hg'*)	PS1+="${BRed}\H${RCol}";;
+			*)	PS1+="${Blu}${On_Whi}\H${RCol}";;
+		esac
 	else 
 		PS1+="\H"
 	fi
diff --git a/bash/scriptlets/zz-fatserf-greet b/bash/scriptlets/zz-fatserf-greet
index d891232..d8a1e97 100644
--- a/bash/scriptlets/zz-fatserf-greet
+++ b/bash/scriptlets/zz-fatserf-greet
@@ -1,3 +1,2 @@
 echo "Welcome onboard:"
 figlet -t sXc : fatSerf
-fortune | cowsay -n
diff --git a/envs/starlink b/envs/starlink
new file mode 100644
index 0000000..758467a
--- /dev/null
+++ b/envs/starlink
@@ -0,0 +1,6 @@
+# Add StarLink
+STARLINK_DIR='/mnt/data/user/bin/star-hikianalia'
+if [ -e $STARLINK_DIR"/etc/profile" ]; then
+	source $STARLINK_DIR"/etc/profile"
+fi 
+
diff --git a/install.conf.yaml b/install.conf.yaml
index 2f50011..eb3560b 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -7,11 +7,14 @@
 
 - link:
     ~/.bashrc: bash/bashrc
-    ~/.profile: profile.sh
     ~/.gitconfig: git/gitconfig
+    ~/.ncmpcpp/config: ncmpcpp/config
+    ~/.profile: profile.sh
+    ~/.ssh/config: ssh/config
+    ~/.tmux: tmux
     ~/.tmux.conf: tmux/tmux.conf
     ~/.vimrc: vim/vimrc
-    ~/.ncmpcpp/config: ncmpcpp/config
+    ~/.xinitrc: xinitrc
 
 #- shell:
 #  - git submodules update # after linking ~/.gitconfig
diff --git a/ncmpcpp/config b/ncmpcpp/config
index ff62ab5..6d1583a 100644
--- a/ncmpcpp/config
+++ b/ncmpcpp/config
@@ -1 +1,5 @@
+colors_enabled = "yes"
+mpd_connection_timeout = "2"
 user_interface = "alternative"
+mpd_crossfade_time = "2"
+
diff --git a/startx b/startx
deleted file mode 100644
index e999430..0000000
--- a/startx
+++ /dev/null
@@ -1 +0,0 @@
-exec gnome
diff --git a/tmux/beatmaker.conf b/tmux/beatmaker.conf
new file mode 100644
index 0000000..6889768
--- /dev/null
+++ b/tmux/beatmaker.conf
@@ -0,0 +1,2 @@
+set -g status-bg blue
+set -g status-right '♪ #(exec amixer get Master | egrep -o "[0-9]+%" | egrep -o "[0-9]*") | ♥#(acpi | cut -d ',' -f 2) | %a %m-%d %H:%M'
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 5447fbb..b837d25 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,9 +1,6 @@
 # use ^b as prefix
 set -g prefix C-b
 
-# vim shortcuts
-setw -g mode-keys vi
-
 # force a reload of the config file
 unbind r
 bind r source-file ~/.tmux.conf\; display "Reloaded!"
@@ -14,6 +11,11 @@ set -g base-index 1
 # vim shortcuts
 setw -g mode-keys vi
 
+# Make copy mode more vim-like.
+bind -t vi-copy v begin-selection
+bind -t vi-copy y copy-selection
+bind -t vi-copy C-v rectangle-toggle
+
 # commands
 bind : command-prompt
 
@@ -32,7 +34,6 @@ bind - split-window -v
 set -g status-left "#h"
 set -g status-left-length 70
 set -g status-right "%a %d-%m-%y :: %H:%M"
-#set -g status-right '♪ #(exec amixer get Master | egrep -o "[0-9]+%" | egrep -o "[0-9]*") | ♥#(acpi | cut -d ',' -f 2) | %a %m-%d %H:%M'
-
-
 
+# Try loading machine specific things
+run-shell "bash ~/.tmux/load_hostnames.sh"
diff --git a/xinitrc b/xinitrc
index 945a060..92edee5 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,3 +1,60 @@
-exec unity
-#exec xterm
-#exec /usr/bin/gnome-session --session=unity
+#!/bin/sh
+#Standard Stuff
+. /etc/X11/xinit/xinitrc-common
+if [ -f $HOME/.Xclients ]; then
+    exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients || \
+    exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients
+elif [ -f /etc/X11/xinit/Xclients ]; then
+    exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients || \
+    exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients
+else
+    # Failsafe settings.  Although we should never get here
+    # (we provide fallbacks in Xclients as well) it can't hurt.
+    [ -x /usr/bin/xsetroot ] && /usr/bin/xsetroot -solid '#222E45'
+    [ -x /usr/bin/xclock ] && /usr/bin/xclock -geometry 100x100-5+5 &
+    [ -x /usr/bin/xterm ] && xterm -geometry 80x50-50+150 &
+    [ -x /usr/bin/twm ] && /usr/bin/twm
+fi
+# ---------------------------------------------------------------
+#	 OWN
+# ---------------------------------------------------------------
+
+
+
+# Load session
+DEFAULT_SESSION=awesome
+XTERM=xterm
+case $1 in
+	xfce4)
+		exec startxfce4
+		;;
+	awesome)
+		xscreensaver -nosplash &
+		nm-applet &
+		exec awesome >> $HOME/.cache/awesome/stdout 2>> $HOME/.cache/awesome/stderr
+		;;
+	enlightenment)
+		exec enlightenment_start
+		;;
+	openbox)
+		exec openbox
+		;;
+	cinnamon)
+		exec cinnamon
+		;;
+	kde)
+		exec startkde
+		;;
+	gnome)
+		exec gnome-session
+		;;
+	unity)
+		exec unity
+		;;
+	xterm)
+		exec xterm
+		;;
+	*)
+		exec $DEFAULT_SESSION
+		;;
+esac