diff --git a/config.toml b/config.toml
index 2972b4c6..affc47ca 100644
--- a/config.toml
+++ b/config.toml
@@ -254,12 +254,11 @@ include = ["terminal", "gpg"]
 include = ["pacman", "terminal"]
 
 [profiles.mko-laptop]
-include = ["terminal", "media", "gpg"]
+include = ["terminal", "gpg"]
 dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "d_systemd"]
 
 [profiles.mko-laptop.variables]
 wayland = true
-scale_factor = 1.25
 
 [profiles.Isengard]
 include = ["terminal"]
diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile
index b45a08ad..149a0e9c 100644
--- a/docker/caddy/Caddyfile
+++ b/docker/caddy/Caddyfile
@@ -1,67 +1,177 @@
 {
-	auto_https off
+	order umami first
 }
 
-http://index.korhonen.lan {
-	root * /var/www/index.korhonen.cc
-	file_server browse
-}
+korhonen.cc, *.korhonen.cc {
+	encode zstd gzip
 
-http://home.korhonen.lan {
-	reverse_proxy home-assistant:8123
-}
-
-http://sso.korhonen.lan, http://sso.korhonen.cc {
-	reverse_proxy authentik:9000
-}
-
-http://git.korhonen.lan {
-	rewrite /user/login /user/oauth2/authentik
-	reverse_proxy forgejo:3000
-}
-
-http://search.korhonen.lan {
-	reverse_proxy searx:8080
-}
-
-http://jellyfin.korhonen.lan {
-	reverse_proxy jellyfin:8096
-}
-
-http://cloud.korhonen.lan {
-	# Redirect login page to Authentik
-	redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301
-
-	# .htaccess / data / config / ... shouldn't be accessible from outside
-	@forbidden {
-		path /.htaccess
-		path /data/*
-		path /config/*
-		path /db_structure
-		path /.xml
-		path /README
-		path /3rdparty/*
-		path /lib/*
-		path /templates/*
-		path /occ
-		path /console.php
-	}
-	handle @forbidden {
-		respond 404
+	tls {
+		dns cloudflare {$CF_API_TOKEN}
+		resolvers 1.1.1.1
 	}
 
-	redir /.well-known/carddav /remote.php/dav 301
-	redir /.well-known/caldav /remote.php/dav 301
-
-	root * /var/www/nextcloud
-	php_fastcgi nextcloud:9000 {
-		root /var/www/html
-		# Tells nextcloud to remove /index.php from URLs in links
-		env front_controller_active true
+	header {
+		Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"
 	}
-	file_server
-}
 
-http://collabora.korhonen.lan {
-	reverse_proxy collabora:9980
+	@static {
+		file
+		path *.ico *.css *.js *.gif *.webp *.avif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.pdf *.webmanifest
+	}
+
+	@homepage-www-redir host www.korhonen.cc
+	handle @homepage-www-redir {
+		redir https://korhonen.cc
+	}
+
+	@homepage host korhonen.cc
+	handle @homepage {
+		# Redirect finnish WIP
+		# @redirFinnish {
+		#     header Accept-Language *fi-FI*
+		#     not path *.js *.css *.png *.jpg *.jpeg *.svg
+		#     not path /en* /fi*
+		#   }
+		#   redir @redirFinnish /fi{uri}
+		#
+		#   uri strip_prefix /en
+
+		header @static Cache-Control max-age=5184000
+		root * /var/www/korhonen.cc
+		file_server
+	}
+
+	@wkd host openpgpkey.korhonen.cc
+	handle @wkd {
+		root * /var/www/wkd
+		file_server browse
+		header Access-Control-Allow-Origin "*"
+	}
+
+	@index host index.korhonen.cc
+	handle @index {
+		umami {
+			event_endpoint "https://umami.korhonen.cc/api/send"
+			website_uuid "9fe4f5c0-8e63-4479-a58d-d399cdbc0a3a"
+			client_ip_header X-Real-IP
+			device_detection
+			allowed_extensions "" .tar.zst .json .html
+		}
+		root * /var/www/index.korhonen.cc
+		file_server browse
+	}
+
+	@home-assistant host home.korhonen.cc
+	handle @home-assistant {
+		reverse_proxy home-assistant:8123
+	}
+
+	@authentik host sso.korhonen.cc
+	handle @authentik {
+		reverse_proxy authentik:9000
+	}
+
+	@forgejo host git.korhonen.cc
+	handle @forgejo {
+		rewrite /user/login /user/oauth2/authentik
+		reverse_proxy forgejo:3000
+	}
+
+	@woodpecker host ci.korhonen.cc
+	handle @woodpecker {
+		reverse_proxy woodpecker:8000
+	}
+
+	@searx host search.korhonen.cc
+	handle @searx {
+		reverse_proxy searx:8080
+	}
+
+	@freshrss host rss.korhonen.cc
+	handle @freshrss {
+		reverse_proxy freshrss
+	}
+
+	@jellyfin host jellyfin.korhonen.cc
+	handle @jellyfin {
+		reverse_proxy jellyfin:8096
+	}
+
+	@pihole host pihole.korhonen.cc
+	handle @pihole {
+		reverse_proxy pihole
+	}
+
+	@umami host umami.korhonen.cc
+	handle @umami {
+		reverse_proxy umami:3000
+	}
+
+	@nextcloud host cloud.korhonen.cc
+	handle @nextcloud {
+		# Redirect login page to Authentik
+		redir /login /apps/sociallogin/custom_oidc/korhonen-sso 301
+
+		# .htaccess / data / config / ... shouldn't be accessible from outside
+		@forbidden {
+			path /.htaccess
+			path /data/*
+			path /config/*
+			path /db_structure
+			path /.xml
+			path /README
+			path /3rdparty/*
+			path /lib/*
+			path /templates/*
+			path /occ
+			path /console.php
+		}
+		handle @forbidden {
+			respond 404
+		}
+
+		redir /.well-known/carddav /remote.php/dav 301
+		redir /.well-known/caldav /remote.php/dav 301
+
+		root * /var/www/nextcloud
+		php_fastcgi nextcloud:9000 {
+			root /var/www/html
+			# Tells nextcloud to remove /index.php from URLs in links
+			env front_controller_active true
+		}
+		file_server
+	}
+
+	@collabora host collabora.korhonen.cc
+	handle @collabora {
+		reverse_proxy collabora:9980
+	}
+
+	@drop host drop.korhonen.cc
+	handle @drop {
+		reverse_proxy drop:3000
+	}
+
+	@ipvX host ipv6.korhonen.cc ipv4.korhonen.cc
+	handle @ipvX {
+		respond {remote_host}
+	}
+
+	handle {
+		respond "404 Not Found" 404
+	}
+
+	handle_errors {
+		@homepage_404 {
+			expression {http.error.status_code} == 404
+			host korhonen.cc
+		}
+		handle @homepage_404 {
+			root * /var/www/korhonen.cc
+			rewrite * /404.html
+			file_server
+		}
+
+		respond "{err.status_code} {err.status_text}"
+	}
 }
diff --git a/docker/caddy/Caddyfile.old b/docker/caddy/Caddyfile.old
index e33bef26..c2597f36 100644
--- a/docker/caddy/Caddyfile.old
+++ b/docker/caddy/Caddyfile.old
@@ -1,7 +1,3 @@
-# My old public configuration.
-# Currently don't have a public IP so running everything in LAN
-# in the current configuration
-
 {
 	order umami first
 }
diff --git a/docker/caddy/docker-compose.yaml b/docker/caddy/docker-compose.yaml
index fa7f5f9e..8187ad08 100644
--- a/docker/caddy/docker-compose.yaml
+++ b/docker/caddy/docker-compose.yaml
@@ -14,6 +14,7 @@ services:
       - 80:80
       - 443:443/tcp
       - 443:443/udp
+      - 127.0.0.1:2019:2019
     networks:
       - proxy
     volumes:
@@ -24,10 +25,8 @@ services:
       - korhonen_cc:/var/www/korhonen.cc
       - nextcloud_config:/var/www/nextcloud
       - /var/www/index.korhonen.cc:/var/www/index.korhonen.cc
-    environment:
-      - CLOUDFLARE_EMAIL
-      - CLOUDFLARE_API_TOKEN
-      - ACME_AGREE=true
+    env_file:
+      - .env
     cap_add:
       - NET_ADMIN
 networks:
diff --git a/docker/cloudflared/docker-compose.yaml b/docker/cloudflared/docker-compose.yaml
new file mode 100644
index 00000000..e4ea0f26
--- /dev/null
+++ b/docker/cloudflared/docker-compose.yaml
@@ -0,0 +1,19 @@
+services:
+  cloudflared:
+    image: cloudflare/cloudflared
+    container_name: cloudflared
+    restart: unless-stopped
+    networks:
+      - proxy
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+    entrypoint:
+    command: tunnel --no-autoupdate run
+    env_file:
+      - .env
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+
+networks:
+  proxy:
+    external: true
diff --git a/docker/forgejo/docker-compose.yaml b/docker/forgejo/docker-compose.yaml
index 44e2e8d6..9659a8a6 100644
--- a/docker/forgejo/docker-compose.yaml
+++ b/docker/forgejo/docker-compose.yaml
@@ -6,7 +6,6 @@ services:
     image: git.korhonen.cc/functionalhacker/forgejo-asciidoc
     container_name: forgejo
     environment:
-      - TZ=Europe/Helsinki
       - USER_UID=1000
       - USER_GID=1000
     restart: unless-stopped
diff --git a/docker/forgejo/runner.yaml b/docker/forgejo/runner.yaml
index 2930b763..2691c298 100644
--- a/docker/forgejo/runner.yaml
+++ b/docker/forgejo/runner.yaml
@@ -10,7 +10,7 @@ runner:
   fetch_timeout: 5s
   fetch_interval: 2s
   labels:
-    - 'docker:docker://git.korhonen.lan/functionalhacker/ubuntu-act:22.04'
+    - 'docker:docker://git.korhonen.cc/functionalhacker/ubuntu-act:22.04'
 
 cache:
   enabled: true
diff --git a/home/.config/git/config b/home/.config/git/config
index 545f3313..9c8c391e 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -1,6 +1,6 @@
 [user]
 {%@@ if profile == "mko-laptop" @@%}
-email = marko.korhonen@rossum.fi
+email = marko.korhonen@netforecast.com
 {%@@ else @@%}
 email = marko@korhonen.cc
 {%@@ endif @@%}
diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json
index 50b95237..1ebcf4b2 100644
--- a/home/.config/nvim/lazy-lock.json
+++ b/home/.config/nvim/lazy-lock.json
@@ -4,62 +4,62 @@
   "auto-dark-mode.nvim": { "branch": "master", "commit": "c31de126963ffe9403901b4b0990dde0e6999cc6" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" },
-  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-git": { "branch": "main", "commit": "d9efd00e0b9527ee05031ce7e7e55d6b118f543e" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" },
   "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
-  "copilot.lua": { "branch": "master", "commit": "3f106ffda3d6b7823b7b384aea160ff49bc7154e" },
+  "copilot.lua": { "branch": "master", "commit": "535ebb53880ae67e33d9e50b503d25f9ef3ca06c" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dropbar.nvim": { "branch": "master", "commit": "c853c7b5ce4c13aceab39ef88e77f8b8669d638e" },
+  "dropbar.nvim": { "branch": "master", "commit": "873ba43f83398fd0e28880cf98fd89e6ce667c51" },
   "firenvim": { "branch": "master", "commit": "c4ab7d2aeb145cd93db8660cb134f771722f2b5e" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" },
-  "gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" },
+  "kanagawa.nvim": { "branch": "master", "commit": "709018d5af92d2e5780bfb8a6d36e9cad01a6402" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" },
+  "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-extra-cmds": { "branch": "main", "commit": "cc7163cb5089236042b5e351cb1a078d0905e40d" },
   "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mini.nvim": { "branch": "main", "commit": "bddfbfc4c1dbca6b852f512e554cf2e05c2960a8" },
+  "mini.nvim": { "branch": "main", "commit": "189010888bc37fc1c382f2dcc81b7a6441160686" },
   "neoformat": { "branch": "master", "commit": "874dcd0995db340278c41860e0209bef29d6ef87" },
   "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
   "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
   "nvim-asciidoc-preview": { "branch": "main", "commit": "b12e113b5f7e7522b4e412213d5498cc529f2628" },
-  "nvim-autopairs": { "branch": "master", "commit": "2a406cdd8c373ae7fe378a9e062a5424472bd8d8" },
-  "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" },
+  "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" },
+  "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" },
+  "nvim-dap": { "branch": "master", "commit": "6a5bba0ddea5d419a783e170c20988046376090d" },
   "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
-  "nvim-jdtls": { "branch": "master", "commit": "7223b812dde98f4260084fe9303c8301b9831a58" },
+  "nvim-jdtls": { "branch": "master", "commit": "2f7bff9b8d2ee1918b36ca55f19547d9d335a268" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4ea9083b6d3dff4ddc6da17c51334c3255b7eba5" },
+  "nvim-lspconfig": { "branch": "master", "commit": "85e0dd26b710e834a105d679200d01e326a3d2b0" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
-  "nvim-tree.lua": { "branch": "master", "commit": "5bea2b37523a31288e0fcab42f3be5c1bd4516bb" },
-  "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" },
+  "nvim-tree.lua": { "branch": "master", "commit": "44d9b58f11d5a426c297aafd0be1c9d45617a849" },
+  "nvim-treesitter": { "branch": "master", "commit": "da5825bf70cc2ea7eacd1e60c32c07baf19adeba" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-ufo": { "branch": "main", "commit": "a026364df62e88037b26d37c9f14c17c006fd577" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
+  "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
   "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "schemastore.nvim": { "branch": "main", "commit": "992285058ce208825eb1b9ac82fa6be7d76ffcc1" },
+  "schemastore.nvim": { "branch": "main", "commit": "d307d291f38678d064cb987112926df6d9134de3" },
   "statuscol.nvim": { "branch": "main", "commit": "c399884e8f64019ec9bb581251f9710915b7f996" },
   "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
-  "telescope-project.nvim": { "branch": "master", "commit": "f1f9d2d042bdff242a392fe14375f37363c37a33" },
+  "telescope-project.nvim": { "branch": "master", "commit": "ce2c9fe209a68c7a924acde42d94ed8a2b2a52c5" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
   "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" },
diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua
index 7c727ce0..ad4afb42 100644
--- a/home/.config/nvim/lua/plugins/mason.lua
+++ b/home/.config/nvim/lua/plugins/mason.lua
@@ -2,10 +2,11 @@
 -- It also handles starting all of my LSP servers
 --- @type LazyPluginSpec
 return {
-  "williamboman/mason.nvim",
+  "mason-org/mason.nvim",
+  version = "^1.0.0",
   dependencies = {
     "neovim/nvim-lspconfig",
-    "williamboman/mason-lspconfig.nvim",
+    { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
     -- Add MasonUpdateAll
     { "Zeioth/mason-extra-cmds", opts = {} },
     -- Add lockfile support
diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json
index 96b83536..25d803af 100644
--- a/home/.config/nvim/mason-lock.json
+++ b/home/.config/nvim/mason-lock.json
@@ -1,23 +1,15 @@
 {
   "bash-language-server": "5.4.3",
-  "clangd": "20.1.0",
+  "bibtex-tidy": "1.14.0",
   "css-lsp": "4.10.0",
   "docker-compose-language-service": "0.3.0",
-  "dockerfile-language-server": "0.14.0",
+  "dockerfile-language-server": "0.13.0",
   "eslint-lsp": "4.10.0",
-  "google-java-format": "v1.26.0",
   "html-lsp": "4.10.0",
-  "java-debug-adapter": "0.58.1",
-  "jdtls": "v1.46.1",
   "json-lsp": "4.10.0",
-  "lemminx": "0.28.1",
-  "lua-language-server": "3.14.0",
-  "nixpkgs-fmt": "1.3.0",
-  "prettier": "3.5.3",
-  "prettierd": "0.26.1",
-  "stylua": "v2.0.2",
-  "taplo": "0.9.3",
-  "tree-sitter-cli": "v0.25.3",
+  "lemminx": "0.28.0",
+  "lua-language-server": "3.13.9",
+  "texlab": "v5.22.1",
   "typescript-language-server": "4.3.4",
   "yaml-language-server": "1.17.0"
 }
\ No newline at end of file
diff --git a/home/.config/nvim/snippets/java.json b/home/.config/nvim/snippets/java.json
deleted file mode 100644
index 6ab73774..00000000
--- a/home/.config/nvim/snippets/java.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "queryListFromModel": {
-    "scope": "java",
-    "description": "Create a method to get a List from the database (Rossum JpaBaseDAO)",
-    "prefix": "queryListFromModel",
-    "body": [
-      "public List<$1> $2($3) {",
-      "    return queryFromModelObject()",
-      "        .where((cb, root) -> $0)",
-      "        .results();",
-      "}"
-    ]
-  }
-}
diff --git a/home/.config/nvim/snippets/javascript.json b/home/.config/nvim/snippets/javascript.json
new file mode 100644
index 00000000..7e0f1e8e
--- /dev/null
+++ b/home/.config/nvim/snippets/javascript.json
@@ -0,0 +1,8 @@
+{
+  "logVariable": {
+    "scope": "javascript",
+    "prefix": "logvar",
+    "description": "Log the variable under the cursor",
+    "body": ["console.log('$1', $1);"]
+  }
+}
diff --git a/home/.config/nvim/snippets/package.json b/home/.config/nvim/snippets/package.json
index 70b1949d..724d4794 100644
--- a/home/.config/nvim/snippets/package.json
+++ b/home/.config/nvim/snippets/package.json
@@ -6,8 +6,8 @@
   "contributes": {
     "snippets": [
       {
-        "language": "java",
-        "path": "./java.json"
+        "language": "javascript",
+        "path": "./javascript.json"
       }
     ]
   }
diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh
index 1a482711..1712bf54 100644
--- a/home/.config/zsh/03-plugins.zsh
+++ b/home/.config/zsh/03-plugins.zsh
@@ -35,16 +35,7 @@ zinit ice lucid atinit'zpcompinit'
 zinit light zdharma-continuum/fast-syntax-highlighting
 
 # use fzf with zsh
-{%@@ if distro_id == "termux" @@%}
-source $PREFIX/share/fzf/key-bindings.zsh
-source $PREFIX/share/fzf/completion.zsh
-{%@@ elif distro_id == "debian" @@%}
-source /usr/share/doc/fzf/examples/key-bindings.zsh
-source /usr/share/doc/fzf/examples/completion.zsh
-{%@@ else @@%}
-source /usr/share/fzf/key-bindings.zsh
-source /usr/share/fzf/completion.zsh
-{%@@ endif @@%}
+source <(fzf --zsh)
 
 # Generate completions at runtime
 zinit ice wait'2' lucid
diff --git a/home/.ssh/config b/home/.ssh/config
index 9225e3e3..b912590c 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -1,4 +1,4 @@
-Include ~/.ssh/rossum_hosts
+Include ~/.ssh/netforecast_hosts
 
 host *
   IdentitiesOnly yes
@@ -31,7 +31,7 @@ host rivendell
   User root
 
 host forgejo
-  HostName git.korhonen.lan
+  HostName git.korhonen.cc
   port 2882
   user git
 
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index 437f09b9..df0355eb 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -30,5 +30,5 @@ Include = /etc/pacman.d/mirrorlist
 Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch
 {%@@ else @@%}
 Include = /etc/pacman.d/pacserve
-Server = http://index.korhonen.lan/repo/arch_linux/$repo/$arch
+Server = http://index.korhonen.cc/repo/arch_linux/$repo/$arch
 {%@@ endif @@%}
diff --git a/root/etc/plymouth/plymouthd.conf b/root/etc/plymouth/plymouthd.conf
index ae558b4b..dffebeca 100644
--- a/root/etc/plymouth/plymouthd.conf
+++ b/root/etc/plymouth/plymouthd.conf
@@ -1,3 +1,7 @@
 [Daemon]
+Theme=arch-charge-gdm-spinner
 ShowDelay=0
 DeviceTimeout=8
+{%@@ if profile == "Moria" @@%}
+DeviceScale=2
+{%@@ endif @@%}