diff --git a/.config/configfiles/wallpaper.png b/.config/configfiles/wallpaper.png
index a01acb2..cdb3a08 100644
Binary files a/.config/configfiles/wallpaper.png and b/.config/configfiles/wallpaper.png differ
diff --git a/.config/cosmic/com.system76.CosmicBackground/v1/all b/.config/cosmic/com.system76.CosmicBackground/v1/all
index e6b2d6c..dffd40e 100644
--- a/.config/cosmic/com.system76.CosmicBackground/v1/all
+++ b/.config/cosmic/com.system76.CosmicBackground/v1/all
@@ -1,6 +1,6 @@
 (
     output: "all",
-    source: Path("/home/user/.config/configfiles/wallpaper.png"),
+    source: Path("/home/user/.dotfiles/.config/configfiles/wallpaper.png"),
     filter_by_theme: true,
     rotation_frequency: 3600,
     filter_method: Lanczos,
diff --git a/.config/cosmic/com.system76.CosmicSettings.Wallpaper/v1/custom-images b/.config/cosmic/com.system76.CosmicSettings.Wallpaper/v1/custom-images
index ba014a8..c783809 100644
--- a/.config/cosmic/com.system76.CosmicSettings.Wallpaper/v1/custom-images
+++ b/.config/cosmic/com.system76.CosmicSettings.Wallpaper/v1/custom-images
@@ -1,3 +1,4 @@
 [
     "/home/user/.config/configfiles/wallpaper.png",
+    "/home/user/.dotfiles/.config/configfiles/wallpaper.png",
 ]
\ No newline at end of file
diff --git a/.config/cosmic/com.system76.CosmicSettings/v1/active-page b/.config/cosmic/com.system76.CosmicSettings/v1/active-page
index 661566d..37d3468 100644
--- a/.config/cosmic/com.system76.CosmicSettings/v1/active-page
+++ b/.config/cosmic/com.system76.CosmicSettings/v1/active-page
@@ -1 +1 @@
-"touchpad"
\ No newline at end of file
+"wallpaper"
\ No newline at end of file
diff --git a/.config/sway/config b/.config/sway/config
index e541edf..26a200e 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -120,16 +120,16 @@ bindsym $mod+Shift+i exec /opt/goland/bin/goland.sh
   bindsym $mod+9 workspace number 9
   bindsym $mod+0 workspace number 10
   # Move focused container to workspace
-  bindsym $mod+Shift+1 move container to workspace number 1
-  bindsym $mod+Shift+2 move container to workspace number 2
-  bindsym $mod+Shift+3 move container to workspace number 3
-  bindsym $mod+Shift+4 move container to workspace number 4
-  bindsym $mod+Shift+5 move container to workspace number 5
-  bindsym $mod+Shift+6 move container to workspace number 6
-  bindsym $mod+Shift+7 move container to workspace number 7
-  bindsym $mod+Shift+8 move container to workspace number 8
-  bindsym $mod+Shift+9 move container to workspace number 9
-  bindsym $mod+Shift+0 move container to workspace number 10
+  bindsym $mod+control+1 move container to workspace number 1
+  bindsym $mod+control+2 move container to workspace number 2
+  bindsym $mod+control+3 move container to workspace number 3
+  bindsym $mod+control+4 move container to workspace number 4
+  bindsym $mod+control+5 move container to workspace number 5
+  bindsym $mod+control+6 move container to workspace number 6
+  bindsym $mod+control+7 move container to workspace number 7
+  bindsym $mod+control+8 move container to workspace number 8
+  bindsym $mod+control+9 move container to workspace number 9
+  bindsym $mod+control+0 move container to workspace number 10
 
   bindsym $mod+control+$left move workspace to output left
   bindsym $mod+control+$down move workspace to output down
diff --git a/.ideavimrc b/.ideavimrc
index 5c5574f..003f682 100644
--- a/.ideavimrc
+++ b/.ideavimrc
@@ -25,7 +25,6 @@ let g:WhichKey_SortOrder = "by_key_prefix_first"
 
 " NerdTree
 Plug 'preservim/nerdtree'
-nnoremap <C-n> :NERDTree<CR>
 
 let g:NERDTreeWinSize=30
 let g:NERDTreeMapPreview=0
@@ -50,6 +49,10 @@ noremap <C-l> <C-w>l
 noremap <C-k> <C-w>k
 noremap <C-j> <C-w>j
 
+
+let g:WhichKeyDesc_GoToFile = "<leader>e Toggle Tree"
+map <leader>e <action>(ActivateProjectToolWindow)
+
 " Navigation
 let g:WhichKeyDesc_GoToFile = "<leader>ff Go to file"
 let g:WhichKeyDesc_RecentFiles = "<leader><leader> Recent files"
@@ -72,13 +75,17 @@ let g:WhichKeyDesc_CloseContent = "<leader>x Close content"
 let g:WhichKeyDesc_MoveEditorToOppositeTabGroup = "<leader>wm Move editor to opposite tab group"
 map <leader>% <action>(SplitVertically)
 map <leader>" <action>(SplitHorizontally)
-map <leader>x <action>(CloseContent)
 map <leader>wm <action>(MoveEditorToOppositeTabGroup)
 
 " Popup Navigation
 inoremap <C-j> <Action>(PopupMenu-selectNext)
 inoremap <C-k> <Action>(PopupMenu-selectPrev)
 
+" Buffers
+let g:WhichKeyDesc_Buffers = "<leader>b Buffer" 
+let g:WhichKeyDesc_Buffers_Delete = "<leader>bd Buffer Delete"
+map <leader>bd <action>(CloseContent)
+
 " Debug options
 let g:WhichKeyDesc_DebugOptions = "<leader>dd Debug options"
 let g:WhichKeyDesc_ToggleLineBreakpoint = "<leader>db Toggle line breakpoint"
@@ -117,7 +124,7 @@ let g:WhichKeyDesc_GotoImplementation = "<leader>gi Goto implementation"
 let g:WhichKeyDesc_ShowUsages = "<leader>gu Show usages"
 let g:WhichKeyDesc_GotoTest = "<leader>gt Goto test"
 let g:WhichKeyDesc_Back = "<leader>gb Back"
-let g:WhichKeyDesc_Forward = "<leader>gf Forward"
+clet g:WhichKeyDesc_Forward = "<leader>gf Forward"
 map <leader>gd <action>(GoToDeclaration)
 map <leader>gy <action>(GotoTypeDeclaraton)
 map <leader>gi <action>(GotoImplementation)
@@ -131,12 +138,23 @@ let g:WhichKeyDesc_GoTag = "<leader>gt Go tag"
 let g:WhichKeyDesc_GoTag_AddKey = "<leader>gt Add Tag"
 map <leader>gt :action IntentionActionAsAction_com.goide.inspections.tag.GoTagAddKeyIntention<CR>
 
+" Git 
+let g:WhichKeyDesc_Git = "<leader>G Git"
+let g:WhichKeyDesc_GitCompare = "<leader>Gc Commit"
+let g:WhichKeyDesc_GitDiff = "<leader>Gd Diff"
+let g:WhichKeyDesc_GitPull = "<leader>Gp Pull"
+let g:WhichKeyDesc_GitPush = "<leader>GP Push"
+map <leader>Gd <action>(Compare.SameVersion)
+map <leader>GP <action>(Vcs.Push)
+map <leader>Gp <action>(Git.Pull)
+map <leader>Gc <action>(CheckinProject)
+map <leader>Gb <action>(Git.CreateNewBranch)
 " Errors
-let g:WhichKeyDesc_Errors = "<leader>e Errors"
-let g:WhichKeyDesc_NextError = "<leader>en Next error in solution"
-let g:WhichKeyDesc_PrevError = "<leader>ep Previous error in solution"
-map <leader>en <action>(ReSharperGotoNextErrorInSolution)
-map <leader>ep <action>(ReSharperGotoPrevErrorInSolution)
+let g:WhichKeyDesc_Errors = "<leader>E Errors"
+let g:WhichKeyDesc_NextError = "<leader>En Next error in solution"
+let g:WhichKeyDesc_PrevError = "<leader>Ep Previous error in solution"
+map <leader>En <action>(ReSharperGotoNextErrorInSolution)
+map <leader>Ep <action>(ReSharperGotoPrevErrorInSolution)
 
 " Menu
 let g:WhichKeyDesc_Menu = "<leader>m Menu"