diff --git a/config/.Xdefaults b/config/.Xdefaults
index b538420..cc2bdb4 100644
--- a/config/.Xdefaults
+++ b/config/.Xdefaults
@@ -1,6 +1,6 @@
 ! urxvt
 ! Fonts
-urxvt*font: xft:DejaVuSansM Nerd Font Mono:style=Regular:size=11:hinting=full, xft:Symbola:style=Regular:pixelsize=14
+urxvt*font: xft:DejaVuSansM Nerd Font Mono:style=Regular:size=10:hinting=full, xft:Symbola:style=Regular:pixelsize=10
 
 ! Behavior
 urxvt*scrollBar: false
diff --git a/config/.config/alacritty/alacritty.toml b/config/.config/alacritty/alacritty.toml
index 7fdc577..ab81cd2 100644
--- a/config/.config/alacritty/alacritty.toml
+++ b/config/.config/alacritty/alacritty.toml
@@ -1,5 +1,5 @@
 [font]
-size = 12
+size = 10
 
 [font.bold]
 style = "Bold"
diff --git a/config/.config/i3/config b/config/.config/i3/config
index f03ad0c..d7f91f6 100644
--- a/config/.config/i3/config
+++ b/config/.config/i3/config
@@ -81,6 +81,7 @@ bindsym $mod+Shift+0 move container to workspace $ws0; workspace $ws0
 # Open specific applications in floating mode
 for_window [class="(?i)virtualbox"] floating enable border normal
 for_window [title="KeePassX$"] floating enable 
+for_window [title="factorio.exe"] floating enable
 
 ###############################################################################
 ############################ Startup Applications #############################
@@ -191,7 +192,7 @@ bindsym $mod+a focus parent
 bindsym $mod+Shift+minus move scratchpad
 
 # restart/exit i3
-# bindsym $mod+Shift+r restart
+bindsym $mod+Shift+r restart
 # bindsym Control+Shift+e exit
 
 # Resize window (you can also use the mouse for that)
diff --git a/config/.gitconfig b/config/.gitconfig
index b708772..47bc7f7 100644
--- a/config/.gitconfig
+++ b/config/.gitconfig
@@ -16,3 +16,6 @@
 
 [diff]
     colorMoved = default
+
+[push]
+  autoSetupRemote = true
diff --git a/config/.scripts/quotes/bojack_horseman.md b/config/.scripts/quotes/bojack_horseman.md
new file mode 100644
index 0000000..c08cf02
--- /dev/null
+++ b/config/.scripts/quotes/bojack_horseman.md
@@ -0,0 +1,8 @@
+We’re just two lonely people trying to hate ourselves a little less.
+Before I leapt, I should have seen the view from halfway down.
+Every happy ending has the day after the happy ending.
+There’s no deep down. I believe that all we are is what we do.
+It gets easier. Every day it gets a little easier. But you gotta do it every day — that’s the hard part. But it does get easier.
+Sometimes, life's a bitch and then you keep living.
+I don't understand how people live. It's amazing to me that people wake up every morning and say: "Yeah! Another day, let's do it!" How do people do it? I don't know how.
+Don't stop dancing.
diff --git a/config/.scripts/startup.sh b/config/.scripts/startup.sh
index cf72ea8..8a7b9f6 100755
--- a/config/.scripts/startup.sh
+++ b/config/.scripts/startup.sh
@@ -3,8 +3,6 @@
 lower_battery_threshold=10
 KBD="";
 oldKBD="";
-intern="eDP";
-extern="HDMI-A-0";
 
 function kb_routine {
   oldKBD="$KBD";
@@ -30,29 +28,9 @@ function battery_routine {
   fi
 }
 
-
-function monitor {
-  if xrandr | grep "$extern disconnected"; then
-    monstats="$intern"
-  else
-    monstats="$extern"
-  fi
-
-  if [ "$oldmonstats" != "$monstats" ]; then
-    oldmonstats="$monstats"
-    feh --randomize --bg-fill $HOME/Pictures/Wallpaper/basic/*;
-    dunstify -r 1 "Using $monstats.";
-    if [ "$monstats" == "$intern" ]; then
-    xrandr --output "$extern" --off --output "$intern" --auto;
-    else 
-    xrandr --output "$intern" --off --output "$extern" --auto;
-    fi
-  fi
-}
 while :
 do
   kb_routine;
   battery_routine;
-  monitor;
   sleep 1;
 done
diff --git a/vim/.config/nvim/lazy-lock.json b/vim/.config/nvim/lazy-lock.json
index a916b15..416eacf 100644
--- a/vim/.config/nvim/lazy-lock.json
+++ b/vim/.config/nvim/lazy-lock.json
@@ -1,63 +1,56 @@
 {
-  "LazyVim": { "branch": "main", "commit": "03968eb3f08036d8b7415712caff7e48b63b8ece" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "623df28bf9a2661d9d5a0f391bf30bdd8f8de62b" },
+  "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "0d18cb5f8faf160335b4ed4699b6b35c616de5b9" },
   "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" },
-  "catppuccin": { "branch": "main", "commit": "0b5df9c9e641b1212b21a0762ccad4434fd41322" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" },
+  "catppuccin": { "branch": "main", "commit": "18bab5ec4c782cdf7d7525dbe89c60bfa02fc195" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" },
-  "crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" },
+  "conform.nvim": { "branch": "master", "commit": "d31323db3fa4a33d203dcb05150d98bd0153c42c" },
+  "crates.nvim": { "branch": "main", "commit": "891063a2dc8471501b9742406a514be62a20c138" },
   "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
-  "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
+  "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
-  "grug-far.nvim": { "branch": "main", "commit": "0fb9cb0f96acbd75f524312c8587bef2a0e20181" },
-  "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" },
-  "lazydev.nvim": { "branch": "main", "commit": "399299ca570aa82c13ee4fb1bd1304ce6baf7f05" },
-  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
+  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
+  "grug-far.nvim": { "branch": "main", "commit": "536b23dcf3165a622654544e5f9f395584e73b57" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
+  "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" },
+  "markdown.nvim": { "branch": "main", "commit": "4c823b1df151dbf1ed3ddaacac517be606b1e145" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
-  "mini.hipatterns": { "branch": "main", "commit": "aa68eb143ce77a57b6416fb4bd71ee0adba5a517" },
-  "mini.icons": { "branch": "main", "commit": "352a25dce86c41ab9fe854dd37f60c36ea7048df" },
+  "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" },
+  "mini.icons": { "branch": "main", "commit": "fe63fe080e76d80713557e5f0c65bc15b14b152d" },
   "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" },
-  "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" },
+  "mini.surround": { "branch": "main", "commit": "d8913ed23be0a1a4585ae34414821cc343a46174" },
   "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" },
-  "noice.nvim": { "branch": "main", "commit": "dd7363eae290ecdb9d6a2db6e0f59527df79edd6" },
+  "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-ansible": { "branch": "main", "commit": "7b1b994e4267b4c99045ef2798f7c12f326c2247" },
-  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
-  "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
-  "nvim-lspconfig": { "branch": "master", "commit": "fa6c2a64100c6f692bbec29bbbc8ec2663c9e869" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a89de2e049b5f89a0ee55029d5a31213bd4de6f8" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
   "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
-  "nvim-treesitter": { "branch": "master", "commit": "debf5816eee21b7d51025ef17ba0647386226cb5" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" },
+  "nvim-treesitter": { "branch": "master", "commit": "ec8776ed9ef56ffe7a61e67b64d5d6b6aba2c631" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" },
   "onedark.vim": { "branch": "main", "commit": "390b893d361c356ac1b00778d849815f2aa44ae4" },
-  "outline.nvim": { "branch": "main", "commit": "2175b6da5b7b5be9de14fd3f54383a17f5e4609c" },
+  "outline.nvim": { "branch": "main", "commit": "b47514b8f4ae3207c499a69eec05c29cf2182af8" },
   "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
-  "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" },
+  "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },
   "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
-  "tokyonight.nvim": { "branch": "main", "commit": "a487cac3113adb1853e3a81060f51d7a391cdea9" },
+  "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" },
   "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
-  "ts-comments.nvim": { "branch": "main", "commit": "8c21ae09c34ef8b82f2c6d2a87f57c3da33bb5e5" },
-  "venv-selector.nvim": { "branch": "regexp", "commit": "47159757b334343fe60f16d52478f827ccefa09d" },
-  "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" },
+  "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" },
   "vim-ledger": { "branch": "master", "commit": "dbc683e24bd5338b8c12540227a58b2d247e097a" },
-  "vimtex": { "branch": "master", "commit": "80c9bc179784c30192d482741a43f176c859daa1" },
-  "which-key.nvim": { "branch": "main", "commit": "48cdaaab93a4c85cac8eb271bb48307ed337787f" },
-  "yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" },
-  "zettelkasten.nvim": { "branch": "master", "commit": "77a9c801969e5b9850ca3dbc63daac6e8161a1e5" }
+  "vimtex": { "branch": "master", "commit": "00c23ab836dceeffadc05d0c4f2ceca1e02810a4" },
+  "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" },
+  "yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" }
 }
diff --git a/vim/.config/nvim/lazyvim.json b/vim/.config/nvim/lazyvim.json
index 0c6829f..e57a2f6 100644
--- a/vim/.config/nvim/lazyvim.json
+++ b/vim/.config/nvim/lazyvim.json
@@ -4,22 +4,14 @@
     "lazyvim.plugins.extras.coding.yanky",
     "lazyvim.plugins.extras.editor.outline",
     "lazyvim.plugins.extras.formatting.prettier",
-    "lazyvim.plugins.extras.lang.ansible",
-    "lazyvim.plugins.extras.lang.clangd",
-    "lazyvim.plugins.extras.lang.docker",
-    "lazyvim.plugins.extras.lang.elixir",
-    "lazyvim.plugins.extras.lang.helm",
     "lazyvim.plugins.extras.lang.json",
     "lazyvim.plugins.extras.lang.markdown",
-    "lazyvim.plugins.extras.lang.python",
     "lazyvim.plugins.extras.lang.rust",
-    "lazyvim.plugins.extras.lang.tailwind",
     "lazyvim.plugins.extras.lang.tex",
-    "lazyvim.plugins.extras.lang.yaml",
-    "lazyvim.plugins.extras.util.mini-hipatterns"
+    "lazyvim.plugins.extras.lang.toml"
   ],
   "news": {
-    "NEWS.md": "6296"
+    "NEWS.md": "6520"
   },
   "version": 6
 }
\ No newline at end of file
diff --git a/vim/.config/nvim/lua/config/lazy.lua b/vim/.config/nvim/lua/config/lazy.lua
index fd269d7..d73bfa1 100644
--- a/vim/.config/nvim/lua/config/lazy.lua
+++ b/vim/.config/nvim/lua/config/lazy.lua
@@ -1,20 +1,23 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  -- bootstrap lazy.nvim
-  -- stylua: ignore
-  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
 end
-vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
+vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
   spec = {
     -- add LazyVim and import its plugins
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-    -- import any extras modules here
-    -- { import = "lazyvim.plugins.extras.lang.typescript" },
-    -- { import = "lazyvim.plugins.extras.lang.json" },
-    -- { import = "lazyvim.plugins.extras.ui.mini-animate" },
     -- import/override with your plugins
     { import = "plugins" },
   },
@@ -28,7 +31,10 @@ require("lazy").setup({
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
   install = { colorscheme = { "tokyonight", "habamax" } },
-  checker = { enabled = true }, -- automatically check for plugin updates
+  checker = {
+    enabled = true, -- check for plugin updates periodically
+    notify = false, -- notify on update
+  }, -- automatically check for plugin updates
   performance = {
     rtp = {
       -- disable some rtp plugins
diff --git a/vim/.config/nvim/lua/plugins/example.lua b/vim/.config/nvim/lua/plugins/example.lua
index de22bc8..4ad9825 100644
--- a/vim/.config/nvim/lua/plugins/example.lua
+++ b/vim/.config/nvim/lua/plugins/example.lua
@@ -190,56 +190,4 @@ return {
       },
     },
   },
-
-  -- Use <tab> for completion and snippets (supertab)
-  -- first: disable default <tab> and <s-tab> behavior in LuaSnip
-  {
-    "L3MON4D3/LuaSnip",
-    keys = function()
-      return {}
-    end,
-  },
-  -- then: setup supertab in cmp
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = {
-      "hrsh7th/cmp-emoji",
-    },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      local has_words_before = function()
-        unpack = unpack or table.unpack
-        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-      end
-
-      local luasnip = require("luasnip")
-      local cmp = require("cmp")
-
-      opts.mapping = vim.tbl_extend("force", opts.mapping, {
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-            -- this way you will only jump inside the snippet region
-          elseif luasnip.expand_or_jumpable() then
-            luasnip.expand_or_jump()
-          elseif has_words_before() then
-            cmp.complete()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
-            luasnip.jump(-1)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      })
-    end,
-  },
 }
diff --git a/vim/.config/nvim/lua/plugins/zettelkasten.lua b/vim/.config/nvim/lua/plugins/zettelkasten.lua
deleted file mode 100644
index 12edd33..0000000
--- a/vim/.config/nvim/lua/plugins/zettelkasten.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-return {
-  {
-    "Furkanzmc/zettelkasten.nvim",
-    keys = function()
-      return {
-        { "<leader>nrf", "<cmd>ZkBrowse<cr>", mode = { "n" }, desc = "Browse ZkNotes" },
-        { "<leader>nri", "<cmd>ZkNew<cr>", mode = { "n" }, desc = "Insert new ZkNote" },
-      }
-    end,
-    opts = {
-      notes_path = "/home/tudattr/Documents/zettelkasten/",
-    },
-  },
-}
diff --git a/vim/.config/nvim/spell/de.utf-8.spl b/vim/.config/nvim/spell/de.utf-8.spl
new file mode 100644
index 0000000..37cbbca
Binary files /dev/null and b/vim/.config/nvim/spell/de.utf-8.spl differ
diff --git a/vim/.config/nvim/spell/de.utf-8.sug b/vim/.config/nvim/spell/de.utf-8.sug
new file mode 100644
index 0000000..13ff0a3
Binary files /dev/null and b/vim/.config/nvim/spell/de.utf-8.sug differ
diff --git a/vim/.config/nvim/spell/en.utf-8.add b/vim/.config/nvim/spell/en.utf-8.add
index c55b735..b2ea7b2 100644
--- a/vim/.config/nvim/spell/en.utf-8.add
+++ b/vim/.config/nvim/spell/en.utf-8.add
@@ -94,3 +94,6 @@ Coveragemessung
 IANA
 SHK
 Rizk
+Bachelorsproject
+Giesen
+bachelorproject
diff --git a/vim/.config/nvim/spell/en.utf-8.add.spl b/vim/.config/nvim/spell/en.utf-8.add.spl
index eb794dd..a71c07c 100644
Binary files a/vim/.config/nvim/spell/en.utf-8.add.spl and b/vim/.config/nvim/spell/en.utf-8.add.spl differ