diff --git a/base/defaults.nix b/base/defaults.nix
index a3f743d..0a52911 100644
--- a/base/defaults.nix
+++ b/base/defaults.nix
@@ -3,7 +3,7 @@
     config = lib.mkDefault {
         i18n.defaultLocale = "en_GB.UTF-8";
         console.keyMap = "us";
-        services.xserver.layout = "us-fruchti";
+        services.xserver.xkb.layout = "us-fruchti";
         services.openssh = {
             enable = true;
             settings = {
diff --git a/base/neovim.nix b/base/neovim.nix
index 59fcc51..2838321 100644
--- a/base/neovim.nix
+++ b/base/neovim.nix
@@ -19,7 +19,7 @@
                     changeColorScheme-vim
                     vim-dispatch
                     vimtex
-                    suda-vim
+                    vim-suda
                 ]; 
                 opt = [];
             };
diff --git a/base/xkb/default.nix b/base/xkb/default.nix
index fc97d17..5c9e6c1 100644
--- a/base/xkb/default.nix
+++ b/base/xkb/default.nix
@@ -1,6 +1,6 @@
 { ... }:
 {
-    services.xserver.extraLayouts = {
+    services.xserver.xkb.extraLayouts = {
         de-x270 = {
             description = "DE layout with some small changes for Thinkpad X270";
             languages   = [ "deu" ];
diff --git a/hosts/forgejo-custom/public/css/fonts.css b/hosts/forgejo-custom/public/assets/css/fonts.css
similarity index 100%
rename from hosts/forgejo-custom/public/css/fonts.css
rename to hosts/forgejo-custom/public/assets/css/fonts.css
diff --git a/hosts/forgejo-custom/public/css/jupyter.css b/hosts/forgejo-custom/public/assets/css/jupyter.css
similarity index 100%
rename from hosts/forgejo-custom/public/css/jupyter.css
rename to hosts/forgejo-custom/public/assets/css/jupyter.css
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2 b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff
diff --git a/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2 b/hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2
rename to hosts/forgejo-custom/public/assets/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2
diff --git a/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.eot b/hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.eot
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.eot
rename to hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.eot
diff --git a/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.svg b/hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.svg
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.svg
rename to hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.svg
diff --git a/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.ttf b/hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.ttf
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.ttf
rename to hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.ttf
diff --git a/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff b/hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.woff
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff
rename to hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.woff
diff --git a/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff2 b/hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.woff2
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff2
rename to hosts/forgejo-custom/public/assets/fonts/hammersmith-one-v17-latin-regular.woff2
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2 b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2 b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2 b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff
diff --git a/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2 b/hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2
similarity index 100%
rename from hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2
rename to hosts/forgejo-custom/public/assets/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2
diff --git a/hosts/forgejo-custom/public/img/apple-touch-icon.png b/hosts/forgejo-custom/public/assets/img/apple-touch-icon.png
similarity index 100%
rename from hosts/forgejo-custom/public/img/apple-touch-icon.png
rename to hosts/forgejo-custom/public/assets/img/apple-touch-icon.png
diff --git a/hosts/forgejo-custom/public/img/avatar_default.png b/hosts/forgejo-custom/public/assets/img/avatar_default.png
similarity index 100%
rename from hosts/forgejo-custom/public/img/avatar_default.png
rename to hosts/forgejo-custom/public/assets/img/avatar_default.png
diff --git a/hosts/forgejo-custom/public/img/favicon.png b/hosts/forgejo-custom/public/assets/img/favicon.png
similarity index 100%
rename from hosts/forgejo-custom/public/img/favicon.png
rename to hosts/forgejo-custom/public/assets/img/favicon.png
diff --git a/hosts/forgejo-custom/public/img/favicon.svg b/hosts/forgejo-custom/public/assets/img/favicon.svg
similarity index 100%
rename from hosts/forgejo-custom/public/img/favicon.svg
rename to hosts/forgejo-custom/public/assets/img/favicon.svg
diff --git a/hosts/forgejo-custom/public/img/logo.png b/hosts/forgejo-custom/public/assets/img/logo.png
similarity index 100%
rename from hosts/forgejo-custom/public/img/logo.png
rename to hosts/forgejo-custom/public/assets/img/logo.png
diff --git a/hosts/forgejo-custom/public/img/logo.svg b/hosts/forgejo-custom/public/assets/img/logo.svg
similarity index 100%
rename from hosts/forgejo-custom/public/img/logo.svg
rename to hosts/forgejo-custom/public/assets/img/logo.svg