diff --git a/autoload.lua b/autoload.lua
new file mode 100644
index 0000000..2506db2
--- /dev/null
+++ b/autoload.lua
@@ -0,0 +1,21 @@
+-- ~/.config/hypr/autoload.lua
+
+local modules = os.getenv("HOME") .. "/.config/hypr/modules"
+
+local p = io.popen('find -L "' .. modules .. '" -name "*.lua" -type f | sort')
+if not p then
+	return
+end
+
+for path in p:lines() do
+	local ok, err = pcall(dofile, path)
+	if not ok then
+		hl.notification.create({
+			text = "autoload: " .. path .. "\n" .. tostring(err),
+			timeout = 8000,
+			icon = "warning",
+		})
+	end
+end
+
+p:close()
diff --git a/hyprland.lua b/hyprland.lua
index 98fbc8a..3c81ce8 100644
--- a/hyprland.lua
+++ b/hyprland.lua
@@ -1 +1,287 @@
-require("modules")
+local handle = io.popen("hostname")
+Hostname = "unknown" -- Default fallback
+
+if handle then
+	local result = handle:read("*l") -- Read the first line
+	handle:close()
+	if result then
+		Hostname = result:gsub("%s+", "") -- Remove whitespace/newlines
+	end
+end
+
+if Hostname == "HACKSTATION" then
+	hl.bind("SUPER + c", hl.dsp.exec_cmd("dunstify " .. tostring(Hostname)))
+end
+
+require("autoload")
+
+-- This is an example Hyprland Lua config file.
+-- Refer to the wiki for more information.
+-- https://wiki.hypr.land/Configuring/Start/
+
+-- Please note not all available settings / options are set here.
+-- For a full list, see the wiki
+
+-- You can (and should!!) split this configuration into multiple files
+-- Create your files separately and then require them like this:
+-- require("myColors")
+
+------------------
+---- MONITORS ----
+------------------
+
+-- See https://wiki.hypr.land/Configuring/Basics/Monitors/
+hl.monitor({
+	output = "",
+	mode = "preferred",
+	position = "auto",
+	scale = "auto",
+})
+
+---------------------
+---- MY PROGRAMS ----
+---------------------
+
+-- Set programs that you use
+local terminal = "kitty"
+local fileManager = "dolphin"
+local menu = "hyprlauncher"
+
+-------------------
+---- AUTOSTART ----
+-------------------
+
+-- See https://wiki.hypr.land/Configuring/Basics/Autostart/
+
+-- Autostart necessary processes (like notifications daemons, status bars, etc.)
+-- Or execute your favorite apps at launch like this:
+--
+-- hl.on("hyprland.start", function ()
+--   hl.exec_cmd(terminal)
+--   hl.exec_cmd("nm-applet")
+--   hl.exec_cmd("waybar & hyprpaper & firefox")
+-- end)
+
+-------------------------------
+---- ENVIRONMENT VARIABLES ----
+-------------------------------
+
+-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Environment-variables/
+
+hl.env("XCURSOR_SIZE", "24")
+hl.env("HYPRCURSOR_SIZE", "24")
+
+-----------------------
+----- PERMISSIONS -----
+-----------------------
+
+-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Permissions/
+-- Please note permission changes here require a Hyprland restart and are not applied on-the-fly
+-- for security reasons
+
+-- hl.config({
+--   ecosystem = {
+--     enforce_permissions = true,
+--   },
+-- })
+
+-- hl.permission("/usr/(bin|local/bin)/grim", "screencopy", "allow")
+-- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow")
+-- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow")
+
+-----------------------
+---- LOOK AND FEEL ----
+-----------------------
+
+-- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/
+
+-- Default curves and animations, see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Animations/
+hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } })
+hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } })
+hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } })
+hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } })
+hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } })
+
+-- Default springs
+hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 })
+
+hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" })
+hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" })
+hl.animation({ leaf = "windows", enabled = true, speed = 4.79, spring = "easy" })
+hl.animation({ leaf = "windowsIn", enabled = true, speed = 4.1, spring = "easy", style = "popin 87%" })
+hl.animation({ leaf = "windowsOut", enabled = true, speed = 1.49, bezier = "linear", style = "popin 87%" })
+hl.animation({ leaf = "fadeIn", enabled = true, speed = 1.73, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeOut", enabled = true, speed = 1.46, bezier = "almostLinear" })
+hl.animation({ leaf = "fade", enabled = true, speed = 3.03, bezier = "quick" })
+hl.animation({ leaf = "layers", enabled = true, speed = 3.81, bezier = "easeOutQuint" })
+hl.animation({ leaf = "layersIn", enabled = true, speed = 4, bezier = "easeOutQuint", style = "fade" })
+hl.animation({ leaf = "layersOut", enabled = true, speed = 1.5, bezier = "linear", style = "fade" })
+hl.animation({ leaf = "fadeLayersIn", enabled = true, speed = 1.79, bezier = "almostLinear" })
+hl.animation({ leaf = "fadeLayersOut", enabled = true, speed = 1.39, bezier = "almostLinear" })
+hl.animation({ leaf = "workspaces", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" })
+hl.animation({ leaf = "workspacesIn", enabled = true, speed = 1.21, bezier = "almostLinear", style = "fade" })
+hl.animation({ leaf = "workspacesOut", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" })
+hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" })
+
+-- Ref https://wiki.hypr.land/Configuring/Basics/Workspace-Rules/
+-- "Smart gaps" / "No gaps when only"
+-- uncomment all if you wish to use that.
+-- hl.workspace_rule({ workspace = "w[tv1]", gaps_out = 0, gaps_in = 0 })
+-- hl.workspace_rule({ workspace = "f[1]",   gaps_out = 0, gaps_in = 0 })
+-- hl.window_rule({
+--     name  = "no-gaps-wtv1",
+--     match = { float = false, workspace = "w[tv1]" },
+--     border_size = 0,
+--     rounding    = 0,
+-- })
+-- hl.window_rule({
+--     name  = "no-gaps-f1",
+--     match = { float = false, workspace = "f[1]" },
+--     border_size = 0,
+--     rounding    = 0,
+-- })
+
+-- See https://wiki.hypr.land/Configuring/Layouts/Dwindle-Layout/ for more
+hl.config({
+	dwindle = {
+		preserve_split = true, -- You probably want this
+	},
+})
+
+-- See https://wiki.hypr.land/Configuring/Layouts/Master-Layout/ for more
+hl.config({
+	master = {
+		new_status = "master",
+	},
+})
+
+-- See https://wiki.hypr.land/Configuring/Layouts/Scrolling-Layout/ for more
+hl.config({
+	scrolling = {
+		fullscreen_on_one_column = true,
+	},
+})
+
+----------------
+----  MISC  ----
+----------------
+
+hl.config({
+	misc = {
+		force_default_wallpaper = -1, -- Set to 0 or 1 to disable the anime mascot wallpapers
+		disable_hyprland_logo = false, -- If true disables the random hyprland logo / anime girl background. :(
+	},
+})
+---------------------
+---- KEYBINDINGS ----
+---------------------
+
+local mainMod = "SUPER" -- Sets "Windows" key as main modifier
+
+-- Example binds, see https://wiki.hypr.land/Configuring/Basics/Binds/ for more
+
+-- Move focus with mainMod + arrow keys
+hl.bind(mainMod .. " + h", hl.dsp.focus({ direction = "left" }))
+hl.bind(mainMod .. " + l", hl.dsp.focus({ direction = "right" }))
+hl.bind(mainMod .. " + k", hl.dsp.focus({ direction = "up" }))
+hl.bind(mainMod .. " + j", hl.dsp.focus({ direction = "down" }))
+
+-- Switch workspaces with mainMod + [0-9]
+-- Move active window to a workspace with mainMod + SHIFT + [0-9]
+for i = 1, 10 do
+	local key = i % 10 -- 10 maps to key 0
+	hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i }))
+	hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i }))
+end
+
+-- Example special workspace (scratchpad)
+hl.bind(mainMod .. " + S", hl.dsp.workspace.toggle_special("magic"))
+hl.bind(mainMod .. " + SHIFT + S", hl.dsp.window.move({ workspace = "special:magic" }))
+
+-- Scroll through existing workspaces with mainMod + scroll
+hl.bind(mainMod .. " + mouse_down", hl.dsp.focus({ workspace = "e+1" }))
+hl.bind(mainMod .. " + mouse_up", hl.dsp.focus({ workspace = "e-1" }))
+
+-- Move/resize windows with mainMod + LMB/RMB and dragging
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
+hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
+
+-- Laptop multimedia keys for volume and LCD brightness
+hl.bind(
+	"XF86AudioRaiseVolume",
+	hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"),
+	{ locked = true, repeating = true }
+)
+hl.bind(
+	"XF86AudioLowerVolume",
+	hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
+	{ locked = true, repeating = true }
+)
+hl.bind(
+	"XF86AudioMute",
+	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
+	{ locked = true, repeating = true }
+)
+hl.bind(
+	"XF86AudioMicMute",
+	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
+	{ locked = true, repeating = true }
+)
+hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true })
+
+-- Requires playerctl
+hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
+hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
+
+--------------------------------
+---- WINDOWS AND WORKSPACES ----
+--------------------------------
+
+-- See https://wiki.hypr.land/Configuring/Basics/Window-Rules/
+-- and https://wiki.hypr.land/Configuring/Basics/Workspace-Rules/
+
+-- Example window rules that are useful
+
+local suppressMaximizeRule = hl.window_rule({
+	-- Ignore maximize requests from all apps. You'll probably like this.
+	name = "suppress-maximize-events",
+	match = { class = ".*" },
+
+	suppress_event = "maximize",
+})
+-- suppressMaximizeRule:set_enabled(false)
+
+hl.window_rule({
+	-- Fix some dragging issues with XWayland
+	name = "fix-xwayland-drags",
+	match = {
+		class = "^$",
+		title = "^$",
+		xwayland = true,
+		float = true,
+		fullscreen = false,
+		pin = false,
+	},
+
+	no_focus = true,
+})
+
+-- Layer rules also return a handle.
+-- local overlayLayerRule = hl.layer_rule({
+--     name  = "no-anim-overlay",
+--     match = { namespace = "^my-overlay$" },
+--     no_anim = true,
+-- })
+-- overlayLayerRule:set_enabled(false)
+
+-- Hyprland-run windowrule
+hl.window_rule({
+	name = "move-hyprland-run",
+	match = { class = "hyprland-run" },
+
+	move = "20 monitor_h-120",
+	float = true,
+})
diff --git a/modules.lua b/modules.lua
deleted file mode 100644
index 8bab8f7..0000000
--- a/modules.lua
+++ /dev/null
@@ -1,28 +0,0 @@
--- loader.lua
-local function get_modules()
-	local modules = {}
-
-	-- -1: list one file per line
-	-- ../modules/*.lua: target sibling directory
-	local cmd = "ls -1 ../modules/*.lua 2>/dev/null"
-
-	local p = io.popen(cmd)
-	if not p then
-		return modules
-	end
-
-	for path in p:lines() do
-		-- Extract the filename between the last '/' and the '.lua'
-		local name = path:match("([^/]+)%.lua$")
-		if name then
-			table.insert(modules, name)
-		end
-	end
-
-	p:close()
-	return modules
-end
-
--- Return the result of the function so require("loader")
--- gives you the table immediately.
-return get_modules()
diff --git a/modules/binds.lua b/modules/binds.lua
index 20ad9aa..b53b3c0 100644
--- a/modules/binds.lua
+++ b/modules/binds.lua
@@ -1,8 +1,37 @@
 local mainMod = "SUPER + "
-local binds = {
-	{ key = "x", dispatch = "kitty" },
+local subMod = mainMod
+local keyboardString = "qwertyuiop"
+
+if Hostname == "mobile02" then
+	mainMod = "ALT + "
+	subMod = "SUPER + "
+	keyboardString = "1234567890"
+end
+
+-- Delete windows
+hl.bind(mainMod .. " + backspace", hl.dsp.window.close())
+
+-- Open windows
+local globalAppBinds = {
+	{ key = "RETURN", dispatch = "kitty" },
+	{ key = "f", dispatch = "firefox" },
+	{ key = "s", dispatch = "nemo" },
 }
 
-for _, bind in ipairs(binds) do
+for _, bind in ipairs(globalAppBinds) do
 	hl.bind(mainMod .. bind.key, hl.dsp.exec_cmd(bind.dispatch))
 end
+
+-- Workspace functions
+local keyboardSplit = {}
+
+for char in keyboardString:gmatch(".") do
+	table.insert(keyboardSplit, char)
+end
+
+for index, bind in ipairs(keyboardSplit) do
+	hl.bind(mainMod .. bind, hl.dsp.focus({ workspace = index }))
+	hl.bind(mainMod .. "SHIFT + " .. bind, hl.dsp.window.move({ workspace = index, follow = false }))
+end
+
+-- Move windows with hjkl
diff --git a/modules/mocha.lua b/modules/mocha.lua
new file mode 100644
index 0000000..f21d444
--- /dev/null
+++ b/modules/mocha.lua
@@ -0,0 +1,133 @@
+return {
+	name = "mocha",
+	rosewater = {
+		hex = "#f5e0dc",
+		rgb = { 245, 224, 220 },
+		hsl = { 10, 0.56, 0.91 },
+	},
+	flamingo = {
+		hex = "#f2cdcd",
+		rgb = { 242, 205, 205 },
+		hsl = { 0, 0.59, 0.88 },
+	},
+	pink = {
+		hex = "#f5c2e7",
+		rgb = { 245, 194, 231 },
+		hsl = { 316, 0.72, 0.86 },
+	},
+	mauve = {
+		hex = "#cba6f7",
+		rgb = { 203, 166, 247 },
+		hsl = { 267, 0.84, 0.81 },
+	},
+	red = {
+		hex = "#f38ba8",
+		rgb = { 243, 139, 168 },
+		hsl = { 343, 0.81, 0.75 },
+	},
+	maroon = {
+		hex = "#eba0ac",
+		rgb = { 235, 160, 172 },
+		hsl = { 350, 0.65, 0.77 },
+	},
+	peach = {
+		hex = "#fab387",
+		rgb = { 250, 179, 135 },
+		hsl = { 23, 0.92, 0.75 },
+	},
+	yellow = {
+		hex = "#f9e2af",
+		rgb = { 249, 226, 175 },
+		hsl = { 41, 0.86, 0.83 },
+	},
+	green = {
+		hex = "#a6e3a1",
+		rgb = { 166, 227, 161 },
+		hsl = { 115, 0.54, 0.76 },
+	},
+	teal = {
+		hex = "#94e2d5",
+		rgb = { 148, 226, 213 },
+		hsl = { 170, 0.57, 0.73 },
+	},
+	sky = {
+		hex = "#89dceb",
+		rgb = { 137, 220, 235 },
+		hsl = { 189, 0.71, 0.73 },
+	},
+	sapphire = {
+		hex = "#74c7ec",
+		rgb = { 116, 199, 236 },
+		hsl = { 199, 0.76, 0.69 },
+	},
+	blue = {
+		hex = "#89b4fa",
+		rgb = { 137, 180, 250 },
+		hsl = { 217, 0.92, 0.76 },
+	},
+	lavender = {
+		hex = "#b4befe",
+		rgb = { 180, 190, 254 },
+		hsl = { 232, 0.97, 0.85 },
+	},
+	text = {
+		hex = "#cdd6f4",
+		rgb = { 205, 214, 244 },
+		hsl = { 226, 0.64, 0.88 },
+	},
+	subtext1 = {
+		hex = "#bac2de",
+		rgb = { 186, 194, 222 },
+		hsl = { 227, 0.35, 0.80 },
+	},
+	subtext0 = {
+		hex = "#a6adc8",
+		rgb = { 166, 173, 200 },
+		hsl = { 228, 0.24, 0.72 },
+	},
+	overlay2 = {
+		hex = "#9399b2",
+		rgb = { 147, 153, 178 },
+		hsl = { 228, 0.17, 0.64 },
+	},
+	overlay1 = {
+		hex = "#7f849c",
+		rgb = { 127, 132, 156 },
+		hsl = { 230, 0.13, 0.55 },
+	},
+	overlay0 = {
+		hex = "#6c7086",
+		rgb = { 108, 112, 134 },
+		hsl = { 231, 0.11, 0.47 },
+	},
+	surface2 = {
+		hex = "#585b70",
+		rgb = { 88, 91, 112 },
+		hsl = { 233, 0.12, 0.39 },
+	},
+	surface1 = {
+		hex = "#45475a",
+		rgb = { 69, 71, 90 },
+		hsl = { 234, 0.13, 0.31 },
+	},
+	surface0 = {
+		hex = "#313244",
+		rgb = { 49, 50, 68 },
+		hsl = { 237, 0.16, 0.23 },
+	},
+	base = {
+		hex = "#1e1e2e",
+		rgb = { 30, 30, 46 },
+		hsl = { 240, 0.21, 0.15 },
+	},
+	mantle = {
+		hex = "#181825",
+		rgb = { 24, 24, 37 },
+		hsl = { 240, 0.21, 0.12 },
+	},
+	crust = {
+		hex = "#11111b",
+		rgb = { 17, 17, 27 },
+		hsl = { 240, 0.23, 0.09 },
+	},
+}
diff --git a/modules/monitors.lua b/modules/monitors.lua
new file mode 100644
index 0000000..bcb90c5
--- /dev/null
+++ b/modules/monitors.lua
@@ -0,0 +1,28 @@
+if Hostname == "HACKSTATION" then
+	hl.monitor({
+		output = "DP-1",
+		position = "0x0",
+		mode = "1920x1080@60",
+		scale = "1",
+	})
+
+	hl.monitor({
+		output = "DP-2",
+		position = "1920x0",
+		mode = "1920x1080@60",
+		scale = "1",
+	})
+
+	hl.monitor({
+		output = "HDMI-A-1",
+		position = "-1920x0",
+		mode = "1920x1080@60",
+		scale = "1",
+	})
+
+	hl.workspace_rule({ workspace = "1", monitor = "DP-1" })
+	hl.workspace_rule({ workspace = "2", monitor = "HDMI-A-1" })
+	hl.workspace_rule({ workspace = "3", monitor = "DP-2" })
+else
+	hl.monitor({ output = "", mode = "preferred", position = "auto", scale = "1.2" })
+end
diff --git a/modules/settings.lua b/modules/settings.lua
new file mode 100644
index 0000000..e69de29
diff --git a/modules/settings/animations.lua b/modules/settings/animations.lua
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/modules/settings/animations.lua
@@ -0,0 +1 @@
+
diff --git a/modules/settings/input.lua b/modules/settings/input.lua
new file mode 100644
index 0000000..28df91d
--- /dev/null
+++ b/modules/settings/input.lua
@@ -0,0 +1,24 @@
+hl.config({
+	input = {
+		kb_layout = "gb",
+		follow_mouse = 1,
+
+		touchpad = {
+			natural_scroll = true,
+			disable_while_typing = true,
+		},
+
+		sensitivity = -0.3,
+		force_no_accel = false,
+		tablet = {
+			left_handed = true,
+			output = "current",
+		},
+	},
+	cursor = {
+		inactive_timeout = 2,
+		warp_on_change_workspace = 1,
+		hide_on_key_press = true,
+		warp_on_toggle_special = 1,
+	},
+})
diff --git a/modules/settings/style.lua b/modules/settings/style.lua
new file mode 100644
index 0000000..2c5d186
--- /dev/null
+++ b/modules/settings/style.lua
@@ -0,0 +1,37 @@
+local ctp = require("modules.mocha")
+hl.config({
+	general = {
+		gaps_in = 3,
+		resize_on_border = true,
+		gaps_out = { top = 5, right = 6, bottom = 6, left = 6 },
+		border_size = 3,
+		layout = "scrolling",
+		col = {
+			active_border = {
+				colors = { "rgba(" .. ctp.mauve.hex:sub(2) .. "cc)", "rgba(" .. ctp.red.hex:sub(2) .. "cc)" },
+				angle = 45,
+			},
+			inactive_border = {
+				colors = { "rgba(" .. ctp.surface1.hex:sub(2) .. "cc)", "rgba(" .. ctp.lavender.hex:sub(2) .. "cc)" },
+				angle = 45,
+			},
+		},
+	},
+	decoration = {
+		rounding = 10,
+		rounding_power = 2,
+
+		-- Change transparency of focused and unfocused windows
+		active_opacity = 1.0,
+		inactive_opacity = 0.8,
+		dim_inactive = true,
+		dim_strength = 0.2,
+
+		blur = {
+			enabled = true,
+			size = 2,
+			passes = 3,
+			vibrancy = 0.5,
+		},
+	},
+})
diff --git a/modules/startup.lua b/modules/startup.lua
index 156555e..6e58604 100644
--- a/modules/startup.lua
+++ b/modules/startup.lua
@@ -1,4 +1,15 @@
+local appList = {
+	"waybar",
+	"dunst",
+	"wpaperd -d",
+	"wayvnc 0.0.0.0 --output=DP-1",
+	"syncthing -home=/home/user01/.config/syncthing -no-browser",
+	"gotify-desktop",
+	"sleep 10 && curl -X POST -H 'Content-Type: application/json' -d '{'ref':'$(git -C ~/.dotfiles rev-parse HEAD)', 'status':'$(git -C ~/.dotfiles diff --quiet && echo 'clean' || echo 'dirty')'}' https://n8n.voidarc.co.uk/webhook/config-checker",
+}
+
 hl.on("hyprland.start", function()
-	hl.exec_cmd("waybar")
-	hl.exec_cmd("dunst")
+	for _, command in ipairs(appList) do
+		hl.exec_cmd(command)
+	end
 end)