diff --git a/.config/awesome/autorun.sh b/.config/awesome/autorun.sh
index 18ba026..7d97fe4 100755
--- a/.config/awesome/autorun.sh
+++ b/.config/awesome/autorun.sh
@@ -14,4 +14,5 @@ run dunst
 run pulseeffects --gapplication-service
 xsetwacom set "Wacom HID 50DB Finger touch" Gesture off
 run touchegg
+run nm-applet
 #run music_wake.sh
diff --git a/.config/awesome/config_laptop.lua b/.config/awesome/config_laptop.lua
index 1e8e9f8..f8de283 100644
--- a/.config/awesome/config_laptop.lua
+++ b/.config/awesome/config_laptop.lua
@@ -30,7 +30,7 @@ return {
         }
     },
     battery = "BAT1",
-    net_interface = "wlp3s0",
+    net_interface = "wlan0",
     volume = {
         options = {"Master", "-D", "pulse"},
         sink = "@DEFAULT_SINK@"
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 7422a9b..b2ea143 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -59,6 +59,18 @@ local vimpc = quake:new({
     vert = "bottom"
 })
 
+local onboard = quake:new({ 
+    app = "onboard",
+    name = "QuakeOnboard",
+    argname = "--name %s",
+    extra = "",
+    border = 0, 
+    height = 0.25,
+    width = 1,
+    horiz = "center",
+    vert = "bottom"
+})
+
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
@@ -715,6 +727,9 @@ globalkeys = gears.table.join(
     awful.key({ modkey, "Shift"   }, "m", function () vimpc:toggle() end,
               {description = "toggle dropdown vimpc terminal", group = "client"}),
 
+    awful.key({ modkey, "Shift"   }, "b", function () onboard:toggle() end,
+              {description = "toggle onboard", group = "client"}),
+
     -- Layout manipulation
     awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
               {description = "swap with next client by index", group = "client"}),
@@ -792,7 +807,7 @@ globalkeys = gears.table.join(
     -- Menubar
     awful.key({ modkey }, "p", function() game_mode_toggle() end,
               {description = "show the menubar", group = "launcher"}),
-    awful.key({ modkey }, "d", function() rofi_spawn("rofi -show run") end,
+    awful.key({ modkey }, "d", function() rofi_spawn("rofi -show drun -me-select-entry '' -me-accept-entry 'MousePrimary'") end,
               {description = "launch rofi", group = "launcher"}),
 
               --[[
@@ -905,6 +920,11 @@ clientbuttons = gears.table.join(
         c:emit_signal("request::activate", "mouse_click", {raise = true})
         end_switcher()
     end),
+    awful.button({ }, 3, function (c)
+        if switcher_mode then
+            c:kill()
+        end
+    end),
     awful.button({ modkey }, 1, function (c)
         c:emit_signal("request::activate", "mouse_click", {raise = true})
         awful.mouse.client.move(c)
@@ -935,7 +955,6 @@ awful.rules.rules = {
                      placement = awful.placement.no_overlap+awful.placement.no_offscreen,
                      maximized_vertical   = false,
                      maximized_horizontal = false,
-                     floating = false,
                      maximized = false
      }
     },
@@ -973,6 +992,16 @@ awful.rules.rules = {
           "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
         }
       }, properties = { floating = true }},
+      
+    { rule_any = {
+        name = {
+          "Onboard", 
+        },
+        class = {
+            "onboard", "Onboard"
+        }
+      }, properties = { focusable = false }},
+      
 
     -- Add titlebars to normal clients and dialogs
     { rule_any = {type = { "normal", "dialog" }
diff --git a/.config/i3/config b/.config/i3/config
index 2eb9b0e..a235d32 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -57,6 +57,8 @@ exec_always --no-startup-id xfce4-power-manager
 #exec_always --no-startup-id xss-lock -- i3lock -i /home/daan/Pictures/wallpapers/wallpaper.png & 
 bindsym $mod+shift+x exec --no-startup-id i3lock -i $backgroud & 
 
+exec_always --no-startup-id xsetwacom set "Wacom HID 50DB Finger touch" Gesture off
+
 exec_always --no-startup-id libinput-gestures-setup start
 #exec_always --no-startup-id export QT_QPA_PLATFORMTHEME="qt5ct"
 exec_always --no-startup-id /usr/lib/kdeconnectd &
diff --git a/.config/mpd/database b/.config/mpd/database
index ae535b6..b294dc0 100644
Binary files a/.config/mpd/database and b/.config/mpd/database differ
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 20fd9d5..94a580d 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -10,7 +10,7 @@
 # be disabled and audio files will only be accepted over ipc socket (using
 # file:// protocol) or streaming files over an accepted protocol.
 #
-music_directory		"~/Sync/Music"
+music_directory		"~/mpd-links"
 #
 # This setting sets the MPD internal playlist directory. The purpose of this
 # directory is storage for playlists created by MPD. The server will use 
@@ -133,12 +133,12 @@ sticker_file			"~/.config/mpd/sticker.sql"
 # If this setting is set to "yes", MPD will discover audio files by following 
 # symbolic links outside of the configured music_directory.
 #
-#follow_outside_symlinks	"yes"
+follow_outside_symlinks	"yes"
 #
 # If this setting is set to "yes", MPD will discover audio files by following
 # symbolic links inside of the configured music_directory.
 #
-#follow_inside_symlinks		"yes"
+follow_inside_symlinks		"yes"
 #
 ###############################################################################
 
diff --git a/.config/mpd/state b/.config/mpd/state
index fc1ea15..b54d9db 100644
--- a/.config/mpd/state
+++ b/.config/mpd/state
@@ -1,7 +1,8 @@
-sw_volume: 25
+sw_volume: 34
 audio_device_state:1:pulse audio
-state: stop
+state: pause
 current: 0
+time: 764.679000
 random: 0
 repeat: 0
 single: 0
@@ -10,11 +11,5 @@ crossfade: 0
 mixrampdb: 0.000000
 mixrampdelay: -1.000000
 playlist_begin
-0:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 01 A Three-Legged Workhorse.flac
-1:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 02 Villa del Refugio.flac
-2:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 03 Threads.flac
-3:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 04 Leather Wings.flac
-4:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 05 The Mighty Rio Grande.flac
-5:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 06 They Move on Tracks of Never-Ending Light.flac
-6:This Will Destroy You/This Will Destroy You - THIS WILL DESTROY YOU - S-T - 07 Burial on the Presidio Banks.flac
+0:Music/Vicetone - 2014 Yeamix - Final + long No Way Out + Vocal Drop.mp3
 playlist_end
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 308b4c0..b2572c7 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -5,7 +5,6 @@ configuration {
 /*	modi: "window,run,ssh";*/
 /*	width: 50;*/
 /*	lines: 15;*/
-	columns: 1;
 	font: "Open Sans 10";
     /*theme: "sidetab";*/
     theme: "~/.config/rofi/sidetab.rasi";
@@ -43,9 +42,6 @@ configuration {
 /*	line-margin: 2;*/
 /*	line-padding: 1;*/
 /*	filter: ;*/
-	separator-style: "solid";
-	hide-scrollbar: true;
-	fullscreen: false;
 /*	fake-transparency: false;*/
 /*	dpi: -1;*/
 /*	threads: 0;*/
@@ -56,10 +52,6 @@ configuration {
 /*	click-to-exit: true;*/
 /*	show-match: true;*/
 /*	theme: ;*/
-	color-normal: "#273238, #c1c1c1, #273238, #394249, #ffffff";
-	color-urgent: "#273238, #ff1844, #273238, #394249, #ff1844";
-	color-active: "#273238, #80cbc4, #273238, #394249, #80cbc4";
-	color-window: "#273238, #273238, #1e2529";
 /*	max-history-size: 25;*/
 /*	combi-hide-mode-prefix: false;*/
 /*	pid: "/run/user/1000/rofi.pid";*/
diff --git a/.config/rofi/sidetab.rasi b/.config/rofi/sidetab.rasi
index 64ba50e..1046c86 100644
--- a/.config/rofi/sidetab.rasi
+++ b/.config/rofi/sidetab.rasi
@@ -12,6 +12,14 @@ configuration {
 	display-window:  "Window";
 	show-icons:      true;
 	sidebar-mode:    true;
+	columns: 1;
+	separator-style: "solid";
+	hide-scrollbar: true;
+	fullscreen: false;
+	color-normal: "#273238, #c1c1c1, #273238, #394249, #ffffff";
+	color-urgent: "#273238, #ff1844, #273238, #394249, #ff1844";
+	color-active: "#273238, #80cbc4, #273238, #394249, #80cbc4";
+	color-window: "#273238, #273238, #1e2529";
 }
 
 * {
diff --git a/.config/tilda/config_0 b/.config/tilda/config_0
index 85b72c3..a6e439d 100644
--- a/.config/tilda/config_0
+++ b/.config/tilda/config_0
@@ -35,7 +35,7 @@ normalize_font_size_key="<Control>0"
 word_chars="-A-Za-z0-9,./?%&#:_"
 lines=5000
 max_width=1920
-max_height=378
+max_height=399
 min_width=1
 min_height=1
 x_pos=0
@@ -60,7 +60,7 @@ cursor_shape=0
 # show_on_monitor_number=0
 # title_max_length_flag=false
 title_max_length=25
-palette = {0, 0, 0, 43690, 0, 0, 0, 43690, 0, 43690, 21845, 0, 0, 0, 43690, 43690, 0, 43690, 0, 43690, 43690, 43690, 43690, 43690, 21845, 21845, 21845, 65535, 21845, 21845, 21845, 65535, 21845, 65535, 65535, 21845, 21845, 21845, 65535, 65535, 21845, 65535, 21845, 65535, 65535, 65535, 65535, 65535}
+palette = {1799, 13878, 16962, 56540, 12850, 12079, 34181, 39321, 0, 46517, 35209, 0, 9766, 35723, 53970, 54227, 13878, 33410, 10794, 41377, 39064, 61166, 59624, 54741, 0, 11051, 13878, 52171, 19275, 5654, 22616, 28270, 30069, 33667, 38036, 38550, 25957, 31611, 33667, 27756, 29041, 50372, 37779, 41377, 41377, 65021, 63222, 58339}
 scrollbar_pos=2
 back_red=0
 back_green=0
diff --git a/.vim/plugged/YouCompleteMe b/.vim/plugged/YouCompleteMe
deleted file mode 160000
index d556a43..0000000
--- a/.vim/plugged/YouCompleteMe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d556a43c1af6a4e4075e875934e250f589df0dee
diff --git a/.vim/plugged/supertab b/.vim/plugged/supertab
deleted file mode 160000
index 40fe711..0000000
--- a/.vim/plugged/supertab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172
diff --git a/.vim/plugged/vim-licenses b/.vim/plugged/vim-licenses
deleted file mode 160000
index 9e29fe7..0000000
--- a/.vim/plugged/vim-licenses
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9e29fe798a2536ead16ac8bfd2c042b45ea62d7e
diff --git a/.vimrc b/.vimrc
index f56083e..034eb4a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,9 +13,12 @@ call plug#begin()
 	Plug 'kana/vim-operator-user'
     Plug 'rust-lang/rust.vim'
     Plug 'Shougo/deoplete.nvim'
+    Plug 'zchee/deoplete-clang'
+    Plug 'Shougo/neoinclude.vim'
     Plug 'roxma/nvim-yarp'
     Plug 'roxma/vim-hug-neovim-rpc'
     "Plug 'tbodt/deoplete-tabnine', { 'do': './install.sh' }
+    Plug 'sebastianmarkow/deoplete-rust'
     Plug 'jpalardy/vim-slime'
     Plug 'autozimu/LanguageClient-neovim', {
     \ 'branch': 'next',
@@ -31,6 +34,11 @@ let g:LanguageClient_serverCommands = {
     \ }
 
 let g:deoplete#enable_at_startup = 1
+let g:deoplete#sources#clang#libclang_path = "/usr/lib/libclang.so"
+let g:deoplete#sources#clang#clang_header = "/usr/lib/clang"
+let g:deoplete#sources#rust#racer_binary='/usr/bin/racer'
+let g:deoplete#sources#rust#rust_source_path='/usr/src/rust/src'
+
  
 set tags+=./.tags
 
diff --git a/.zshrc b/.zshrc
index 378fb1c..2bd3e2e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -198,10 +198,11 @@ alias v="vi"
 # Scripts
 
 alias rotate="~/.config/i3/rotate.sh"
-alias tp='source tp'
 
 alias ant="JAVA_HOME=/usr/lib/jvm/java-11-openjdk ant"
 
+source "tp"
+
 
 # /!\ do not use with zsh-autosuggestions