diff --git a/.vimrc b/.vimrc
index c60d0ea..4474bc3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -56,6 +56,31 @@ set noexpandtab
 " use blowfish for file encryption
 set cm=blowfish
 
+" vimwiki
+set nocompatible
+filetype plugin on
+" vimwiki stuff "
+" Run multiple wikis "
+let g:vimwiki_list = [
+                        \{'path': '~/b2_sync/Wiki/personal.wiki'},
+                        \{'path': '~/b2_sync/Wiki/tech.wiki'}
+                \]
+au BufRead,BufNewFile *.wiki set filetype=vimwiki
+autocmd FileType vimwiki map <F5> :VimwikiMakeDiaryNote<CR>
+function! ToggleCalendar()
+  execute ":Calendar"
+  if exists("g:calendar_open")
+    if g:calendar_open == 1
+      execute "q"
+      unlet g:calendar_open
+    else
+      g:calendar_open = 1
+    end
+  else
+    let g:calendar_open = 1
+  end
+endfunction
+autocmd FileType vimwiki map c :call ToggleCalendar()<CR>
 
 " ###############################
 " # Language Dependent settings #
@@ -97,6 +122,7 @@ set autoindent
 
 " Set 256 colour mode and Theme.
 set t_Co=256
-colorscheme mustang
+" colorscheme mustang
+colorscheme TrippingRobot
 
 
diff --git a/desktop/i3/config b/desktop/i3/config
index 7a4db98..3d46e63 100644
--- a/desktop/i3/config
+++ b/desktop/i3/config
@@ -19,7 +19,7 @@ font pango:monospace 8
 #exec feh --bg-fill /home/david/Pictures/Wallpapers/ellie_full.jpg
 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
 
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
@@ -96,7 +96,7 @@ bindsym $mod+f fullscreen toggle
 
 for_window [title="^scratchpad$"] border 1pixel, floating enable, move scratchpad
 bindsym F1 [instance="scratchpad"] scratchpad show; sticky enable
-exec urxvt -name scratchpad -geometry 186x48
+exec urxvt -name scratchpad -geometry 120x80
 
 # change container layout (stacked, tabbed, toggle split)
 bindsym $mod+s layout stacking
@@ -190,19 +190,21 @@ bindsym $mod+r mode "resize"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 bar {
-	status_command i3blocks -c /home/david/dotfiles/i3blocks.conf </dev/null
+  status_command i3blocks -c /home/david/dotfiles/i3blocks.conf </dev/null
+
   colors {
-    separator #928374
-    background #333333
-    statusline #AAAAAA
-    focused_workspace #282828 #282828 #FFFFFF #FFFFFF
-    active_workspace #1d2021 #1d2021 #928374 #aea79f
-    inactive_workspace #333333 #333333 #AAAAAA #AAAAAA
-    urgent_workspace #cc241d #cc241d #ebdbb2 #ffffff
+	statusline #FFFFFF
+	background #000000
+			    #Border #Backgr #Font
+	focused_workspace  #000000 #FFFFFF #000000
+	active_workspace   #000000 #000000 #FFFFFF
+	inactive_workspace #000000 #000000 #FFFFFF
+	urgent_workspace   #000000 #CB4F29 #FFFFFF 
   }
 }
-
-client.focused #000000 #000000 #FFFFFF #000000
-client.focused_inactive #333333 #333333 #FFFFFF #000000
-client.unfocused #333333 #333333 #FFFFFF #333333
-client.urgent #cc241d #cc241d #ebdbb2 #282828
+# class                 border  backgr. text    indicator
+client.focused          #000000 #FFFFFF #000000 #FFFFFF
+client.focused_inactive #000000 #000000 #FFFFFF #000000
+client.unfocused        #000000 #000000 #FFFFFF #000000
+client.urgent           #000000 #000000 #ffffff #000000
+client.placeholder      #000000 #000000 #ffffff #000000
diff --git a/setup.sh b/setup.sh
index 2aaffe5..b30cf44 100755
--- a/setup.sh
+++ b/setup.sh
@@ -88,7 +88,10 @@ curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
 
 mkdir -p ~/.vim/plugin
 
-#wget "https://www.vim.org/scripts/download_script.php?src_id=26272" -O ~/.vim/plugin/switch.vim
+git clone https://github.com/vimwiki/vimwiki.git ~/.vim/bundle/vinwiki
+git clone git://github.com/mattn/calendar-vim ~/.vim/bundle/calendar-vim
+
+wget "https://www.vim.org/scripts/download_script.php?src_id=26272" -O ~/.vim/plugin/switch.vim
 
 echo -e "${GREEN} Installing Deps ${RESET}"
 echo -e "vim-airline"
@@ -102,8 +105,12 @@ echo -e "${GREEN} nerdtree ${RESET}"
 git clone https://github.com/scrooloose/nerdtree.git ~/.vim/bundle/nerdtree &> /dev/null
 
 echo -e "${GREEN} mustang colour theme ${RESET}" 
-git clone https://github.com/croaker/mustang-vim tmp/ &> /dev/null
-cp tmp/colors/mustang.vim ~/.vim/colors/
+mkdir -p tmp/
+git clone https://github.com/croaker/mustang-vim tmp/mustang &> /dev/null
+git clone git@github.com:qwelyt/TrippingRobot.git tmp/tr &> /dev/null
+
+cp tmp/mustang/colors/mustang.vim ~/.vim/colors/
+cp tmp/tr/colors/TrippingRobot.vim ~/.vim/colors/
 
 echo -e "${GREEN} clearning up ${RESET}"