diff --git a/docs/linux/_category_.json b/docs/linux/_category_.json
new file mode 100644
index 0000000..cd4e98c
--- /dev/null
+++ b/docs/linux/_category_.json
@@ -0,0 +1,10 @@
+{
+    "position": 8,
+    "label": "Linux Guides",
+    "collapsible": true,
+    "collapsed": true,
+    "link": {
+        "type": "generated-index",
+        "description": "Guides all around Linux"
+    }
+  }
\ No newline at end of file
diff --git a/docs/arch-system-setup/_category_.json b/docs/linux/arch-system-setup/_category_.json
similarity index 100%
rename from docs/arch-system-setup/_category_.json
rename to docs/linux/arch-system-setup/_category_.json
diff --git a/docs/arch-system-setup/desktop.md b/docs/linux/arch-system-setup/desktop.md
similarity index 92%
rename from docs/arch-system-setup/desktop.md
rename to docs/linux/arch-system-setup/desktop.md
index c07d7fd..557bd6b 100644
--- a/docs/arch-system-setup/desktop.md
+++ b/docs/linux/arch-system-setup/desktop.md
@@ -33,6 +33,10 @@ cp /tmp/jetbrains-nerd-font/JetBrainsMonoNerdFont-Bold.ttf ~/.local/share/fonts/
 fc-cache -f -v
 
 ```
+:::note
+This is for the JetBrains Mono Font. All other available fonts can be found in [this](https://github.com/archdroid20/nerd-fonts-complete) repository.
+:::
+
 Restart the terminal / reinitialize the shell and any other programs you might need in order to update the emojis and icons for the next step or else they won't appear in the ZSH setup process.
 
 ## Icon pack (MacOS-Icons)
@@ -120,7 +124,31 @@ The following flatpaks can also be installed:
 flatpak install ca.desrt.dconf-editor cc.arduino.IDE2 com.bitwarden.desktop com.discordapp.Discord com.github.Matoking.protontricks com.github.tchx84.Flatseal com.heroicgameslauncher.hgl com.jaquadro.NBTExplorer com.mattjakeman.ExtensionManager com.modrinth.ModrinthApp com.obsproject.Studio com.playonlinux.PlayOnLinux4 com.protonvpn.www com.skype.Client com.spotify.Client com.sublimetext.three com.usebottles.bottles com.valvesoftware.Steam com.visualstudio.code dev.alextren.Spot dev.lasheen.qr fr.romainvigier.MetadataCleaner io.github.arunsivaramanneo.GPUViewer io.github.diegoivan.pdf_metadata_editor io.github.flattool.Warehouse io.github.Foldex.AdwSteamGtk io.gitlab.gregorni.Letterpress io.github.jonmagon.kdiskmark io.github.prateekmedia.appimagepool io.github.realmazharhussain.GdmSettings io.github.shiftey.Desktop io.github.thetumultuousunicornofdarkness.cpu-x io.github.ungoogled_software.ungoogled_chromium net.ankiweb.Anki net.lutris.Lutris org.audacityteam.Audacity org.bleachbit.BleachBit org.blender.Blender org.freedesktop.Piper org.gaphor.Gaphor org.gnome.Boxes org.gnome.design.IconLibrary org.gnome.PowerStats org.gnome.seahorse.Application org.gnome.World.PikaBackup org.kde.filelight org.kde.kdenlive org.kde.krita org.libreoffice.LibreOffice org.mozilla.Thunderbird org.onlyoffice.desktopeditors org.prismlauncher.PrismLauncher org.qbittorrent.qBittorrent org.raspberrypi.rpi-imager org.signal.Signal org.torproject.torbrowser-launcher org.videolan.VLC page.kramo.Cartridges sh.ppy.osu xyz.xclicker.xclicker
 ```
 
+## Caddy and Reverse Proxy Aliases
+To achieve nice reverse proxies like `http://syncthing` for the local syncthing we need to install and enable `caddy`:
+```bash
+yay -S caddy
+sudo systemctl enable --now caddy
+```
+Now we edit the `/etc/hosts` file by adding the following line (e.g. for syncthing):
+```bash
+127.0.0.1 syncthing
+```
+Next, we add the configuration to `/etc/caddy/Caddyfile`:
+```json
+http://syncthing {
+    reverse_proxy 127.0.0.1:8384 {
+        header_up Host localhost
+    }
+}
+```
+A simple reload and it should work:
+```bash
+sudo systemctl reload caddy
+```
+
 ## SDKman and java
+To easily install and mange different java versions, we install SDKman along with Java 21:
 ```bash
 curl -s "https://get.sdkman.io" | bash
 source "$HOME/.sdkman/bin/sdkman-init.sh"
@@ -245,10 +273,13 @@ gsettings set org.gnome.desktop.peripherals.touchpad natural-scroll false
 # Set keyboard layout to English (US, intl with dead keys)
 gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us:intl')]"
 ```
+
+:::info[Coming Soon]
 //TODO: additional config
 
 ## KDE
 //TODO: config that is not yet translated to commands
 
 ## Niri
-//TODO everything
\ No newline at end of file
+//TODO everything
+:::
diff --git a/docs/arch-system-setup/index.md b/docs/linux/arch-system-setup/index.md
similarity index 98%
rename from docs/arch-system-setup/index.md
rename to docs/linux/arch-system-setup/index.md
index 56d6993..909e11b 100644
--- a/docs/arch-system-setup/index.md
+++ b/docs/linux/arch-system-setup/index.md
@@ -1,6 +1,6 @@
 ---
 sidebar_position: 1
-slug: /archsetup/
+slug: /linux/archsetup/
 ---
 
 # Arch-Linux Setup
diff --git a/docs/arch-system-setup/server.md b/docs/linux/arch-system-setup/server.md
similarity index 100%
rename from docs/arch-system-setup/server.md
rename to docs/linux/arch-system-setup/server.md
diff --git a/docs/linux/index.md b/docs/linux/index.md
new file mode 100644
index 0000000..462f35a
--- /dev/null
+++ b/docs/linux/index.md
@@ -0,0 +1,6 @@
+---
+sidebar_position: 1
+slug: /linux
+---
+
+# Overview