diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index aa3c5a5..962f730 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -26,7 +26,7 @@
       neoformat
 
       # Colorscheme
-      monokai-pro-nvim
+      papercolor-theme
 
       # Filebrowser
       nvim-tree-lua
@@ -67,6 +67,9 @@
       # Session management
       auto-session
 
+      # zoom into windows
+      zoomwintab-vim
+
       # Telescope
       plenary-nvim
       telescope-nvim
@@ -76,9 +79,6 @@
 
       # Add/change surrounding characters
       nvim-surround
-
-      # better undo history
-      undotree
     ];
 
     extraConfig = ''
@@ -88,7 +88,7 @@
       set background=dark
       set number
       set laststatus=2
-      colorscheme monokai-pro-octagon
+      colorscheme PaperColor
       set hlsearch
       set tabstop=4
       set shiftwidth=4
@@ -115,10 +115,6 @@
       nnoremap <silent><cr> :nohlsearch<CR>
       inoremap jj <Esc>
 
-      nnoremap <leader>n :NvimTreeToggle<CR>
-
-      nnoremap <leader>u :UndotreeToggle<CR>
-
       " Faster tab switching
       map <Tab> :bnext<cr>
       map <S-Tab> :bprevious<cr>
@@ -196,9 +192,6 @@
           auto_restore_enabled = true;
         }
         require("bufferline").setup{}
-
-        vim.g.loaded_netrw = 1
-        vim.g.loaded_netrwPlugin = 1
         require("nvim-tree").setup()
 
         require('lspconfig').gopls.setup{}
diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix
index 08159ab..bb7d0be 100644
--- a/home-manager/modules/zsh.nix
+++ b/home-manager/modules/zsh.nix
@@ -23,7 +23,6 @@
       "cat" = "bat --theme=TwoDark --style=plain";
       "watch" =  "watch "; # https://unix.stackexchange.com/a/25329
       "kge" = "kubectl get events --sort-by='.lastTimestamp'";
-      "devcontainer" = "docker compose -f docker-compose.yml -f .devcontainer/docker-compose.yml"; # Poor mans devcontainer
     };
     initExtra = ''
       setopt APPEND_HISTORY # Append history to global histfile on exit