diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 6c18ff0..e07af62 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -111,6 +111,7 @@
     substituters = ["https://hyprland.cachix.org"];
     trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
     trusted-users = [ "root" "@wheel" ];
+    allowed-users = [ "root" "@wheel" ];
   };
 
   nix.gc = {
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 2c775b9..c18b17e 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -118,10 +118,6 @@
 
   xdg.enable = true;
   xdg.configFile = {
-    "contour" = {
-      recursive = true;
-      source = ../../modules/non-nix_configs/contour;
-    };
     "emacs" = {
       recursive = true;
       source = ../../modules/non-nix_configs/emacs;
@@ -174,6 +170,7 @@
         ls = "ls --color=auto";
         ll = "ls -l";
         la = "ls -lA";
+        nixrebuild = "nixos-rebuild build --flake ~/personal/nixos#default && sudo nixos-rebuild switch --flake ~/personal/nixos#default";
         nixbuild = "sudo nixos-rebuild switch --flake";
         nixtest = "sudo nixos-rebuild test --flake";
         new = "source $HOME/.bashrc";
diff --git a/modules/non-nix_configs/ghostty/config b/modules/non-nix_configs/ghostty/config
index a15c3a7..a18890e 100644
--- a/modules/non-nix_configs/ghostty/config
+++ b/modules/non-nix_configs/ghostty/config
@@ -1,61 +1,35 @@
 # The syntax is "key = value". The whitespace around the equals doesn't matter.
-background= 000000
-foreground= ffffff
-
-# Blank lines are ignored!
 
 keybind = ctrl+shift+w=close_surface
 keybind = ctrl+t=new_tab
 keybind = ctrl+tab=next_tab
 keybind = ctrl+shift+tab=previous_tab
 keybind = ctrl+shift+n=new_window
+keybind = ctrl+shift+o=ignore
 
-# window stuff
-background-opacity=0.8
+# Window Stuff
+background-opacity=0.9
 confirm-close-surface = false
 window-theme = dark
 window-decoration = false
 
-# linux specific
+# Linux Specific
 gtk-wide-tabs = true
 
-# macos specific
+# MacOS Specific
 #macos-non-native-fullscreen = true
 
-# font
+# Font
 font-size = 14
 
-# cursor and mouse
+# Cursor And Mouse
 cursor-style = block
 cursor-color = #ffffff
 mouse-hide-while-typing = true
 
-theme = Bright Lights
-
-# Colors can be changed by setting the 16 colors of `palette`, which each color
-# being defined as regular and bold.
-#
-# black
-# palette = 0=#0c0c0c
-# palette = 8=#767676
-# # red
-# palette = 1=#c50f1f
-# palette = 9=#e74856
-# # green
-# palette = 2=#13a10e
-# palette = 10=#16c60c
-# # yellow
-# palette = 3=#c19c00
-# palette = 11=#f9f1a5
-# # blue
-# palette = 4=#0037da
-# palette = 12=#3b78ff
-# # purple
-# palette = 5=#881798
-# palette = 13=#b4009e
-# # aqua
-# palette = 6=#3a96dd
-# palette = 14=#61d6d6
-# # white
-# palette = 7=#cccccc
-# palette = 15=#f2f2f2
+# Theme
+# theme = Grape
+# theme = Bright Lights
+theme = tokyonight
+# theme = Purple Rain
+# theme = Mariana
diff --git a/modules/non-nix_configs/nvim/after/plugin/lsp.lua b/modules/non-nix_configs/nvim/after/plugin/lsp.lua
index 80222af..b96ce73 100644
--- a/modules/non-nix_configs/nvim/after/plugin/lsp.lua
+++ b/modules/non-nix_configs/nvim/after/plugin/lsp.lua
@@ -30,6 +30,7 @@ lsp_zero.extend_lspconfig({
 local lspconfig = require('lspconfig')
 
 require('mason').setup({})
+
 require('mason-lspconfig').setup({
   ensure_installed = {
       'lua_ls',
@@ -61,37 +62,7 @@ require('mason-lspconfig').setup({
           })
       end,
       jdtls  = function()
-          lspconfig.jdtls.setup({
-              cmd = {
-                  "java",
-                  "-Declipse.application=org.eclipse.jdt.ls.core.id1",
-                  "-Dosgi.bundles.defaultStartLevel=4",
-                  "-Declipse.product=org.eclipse.jdt.ls.core.product",
-                  "-Dlog.protocol=true",
-                  "-Dlog.level=ALL",
-                  "-Xms1g",
-                  "--add-modules=ALL-SYSTEM",
-                  "--add-opens",
-                  "java.base/java.util=ALL-UNNAMED",
-                  "--add-opens",
-                  "java.base/java.lang=ALL-UNNAMED",
-                  --
-              },
-              single_file_support = true,
-              settings = {
-                  java = {
-                      signatureHelp = {enabled = true},
-                      import = {enabled = true},
-                      rename = {enabled = true}
-                  }
-              },
-              flags = {
-                  debounce_text_changes = 150,
-              },
-              init_options = {
-                  bundles = {},
-              },
-          })
+          lspconfig.jdtls.setup{}
       end,
       zls    = function()
           lspconfig.zls.setup({})
@@ -105,12 +76,12 @@ require('mason-lspconfig').setup({
                           return
                       end
                   end
-          
+
                   client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
                       runtime = {
                        -- Tell the language server which version of Lua you're using
                        -- (most likely LuaJIT in the case of Neovim)
-                           
+
                           version = 'LuaJIT'
                       },
                       -- Make the server aware of Neovim runtime files
diff --git a/modules/non-nix_configs/nvim/lua/liamm/packer.lua b/modules/non-nix_configs/nvim/lua/liamm/packer.lua
index a8bf5c1..7569e56 100644
--- a/modules/non-nix_configs/nvim/lua/liamm/packer.lua
+++ b/modules/non-nix_configs/nvim/lua/liamm/packer.lua
@@ -21,6 +21,8 @@ return require('packer').startup(function(use)
           'nvim-neotest/nvim-nio' -- dep of dap-ui
       }
   }
+  use 'mfussenegger/nvim-jdtls' -- Java LSP Support
+
   use 'tpope/vim-fugitive' -- git integration
   --LSP CONFIG
   --