diff --git a/.bashrc b/.bashrc
index 4c35d72..8369399 100644
--- a/.bashrc
+++ b/.bashrc
@@ -56,6 +56,8 @@ alias checkout='git checkout'
 alias master='git checkout master'
 alias blame='git log --graph --pretty=oneline --abbrev-commit'
 
+alias did="vim +'normal Go' +'r!date' ~/did.txt"
+
 alias du="ncdu -rr -x --exclude .git --exclude node_modules"
 
 alias fixtouch="xinput map-to-output 9 eDP-1"
@@ -96,17 +98,20 @@ export NVM_DIR="$HOME/.nvm"
 # Yavide alias
 alias yavide="gvim --servername yavide -f -N -u /opt/yavide/.vimrc"
 
-alias t="clear; python ~/t/t.py --task-dir ~/b2_sync/t --list tasks"
-alias tw="t | grep 'verify'"
+# alias t="clear; python ~/t/t.py --task-dir ~/b2_sync/t --list tasks"
+# alias tw="t | grep 'verify'"
 
-function ta() {
-    t "$1"
-    t
-}
-function tf() {
-    t -f "$1"
-    t
-}
+alias t="clear; todoist list --filter '(overdue | today | tomorrow) | p1'"
+
+
+# function ta() {
+#     t "$1"
+#     t
+# }
+# function tf() {
+#     t -f "$1"
+#     t
+# }
 
 
 # include .bashrc helpers if they exist (Non-Open Source helpers)
diff --git a/.vimrc b/.vimrc
index 7257744..01c964a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -176,6 +176,6 @@ set autoindent
 " Set 256 colour mode and Theme.
 set t_Co=256
 " colorscheme mustang
-colorscheme TrippingRobot
+colorscheme desert
 
 
diff --git a/i3/config b/i3/config
index d093dc0..8c47afe 100644
--- a/i3/config
+++ b/i3/config
@@ -20,6 +20,7 @@ font pango:monospace 8
 exec feh --bg-fill /home/david/Pictures/wall.jpg
 exec setxkbmap -layout gb,ru -variant ,winkeys -option grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp,compose:ralt
 exec dunst
+exec xbindkeys
 exec pasystray
 
 
@@ -38,9 +39,13 @@ exec pasystray
 floating_modifier $mod
 
 # Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% #increase sound volume
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5% #decrease sound volume
-bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle # mute sound
+#bindsym XF86AudioRaiseVolume exec pactl set-sink-volume 0 +5% #increase sound volume
+#bindsym XF86AudioLowerVolume exec pactl set-sink-volume 0 -5% #decrease sound volume
+#bindsym XF86AudioMute exec pactl set-sink-mute 0 toggle # mute sound
+
+bindsym XF86AudioRaiseVolume exec amixer -D pulse sset Master 5%+ #increase sound volume
+bindsym XF86AudioLowerVolume exec amixer -D pulse sset Master 5%- #decrease sound volume
+bindsym XF86AudioMute exec amixer -D pulse set Master 1+ toggle # mute sound
 
 bindsym $super+bracketright exec pactl set-sink-volume 0 +5% #increase sound volume
 bindsym $super+bracketleft exec pactl set-sink-volume 0 -5% #decrease sound volume
diff --git a/keyboard/Model M/as400.sc b/keyboard/Model M/as400.sc
new file mode 100644
index 0000000..d977712
--- /dev/null
+++ b/keyboard/Model M/as400.sc	
@@ -0,0 +1,49 @@
+layerblock
+  FN1 1  # FN1 is a virtual key and is not the same thing as a physical F1 function key.
+endblock
+
+remapblock
+
+F13           ESC
+ESC           NUM_LOCK
+NUM_LOCK      PAD_SLASH
+SCROLL_LOCK   PAD_ASTERIX
+EXTRA_SYSRQ   PAD_MINUS
+PAD_MINUS     PAD_PLUS
+PAD_PLUS      PAD_ENTER
+PAD_ASTERIX   TAB
+RALT          LGUI
+BACKSLASH     EUROPE_2
+F23           PRINTSCREEN
+F24           SCROLL_LOCK
+LANG_4        PAUSE
+RALT	      FN1
+
+endblock
+
+remapblock
+ layer 1
+	BACKSLASH		BACKSLASH
+    L               EXSEL
+    E               LGUI + E
+    D               LGUI + D
+    RIGHT_BRACE     MEDIA_VOLUME_UP
+    LEFT_BRACE      MEDIA_VOLUME_DOWN
+    P               MEDIA_MUTE
+    RCTRL           F22
+endblock
+
+macroblock
+    macro EXSEL
+        PUSH_META SET_META LGUI
+        press L
+        POP_ALL_META
+    endmacro
+
+    macro F22
+        press 6
+        press 1
+        press ENTER
+    endmacro
+
+endblock
diff --git a/setup.sh b/setup.sh
index 5ac0977..4846e7b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -87,9 +87,9 @@ echo -e "${GREEN} Please run :helptags on first run ${RESET}"
 git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline &> /dev/null
 git clone git://github.com/digitaltoad/vim-pug.git &> /dev/null
 
-echo -e "${GREEN} nerdtree ${RESET}"
+echo -e "${GREEN} Vundle ${RESET}"
 
-git clone https://github.com/scrooloose/nerdtree.git ~/.vim/bundle/nerdtree &> /dev/null
+git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
 echo -e "${GREEN} mustang colour theme ${RESET}" 
 mkdir -p tmp/