diff --git a/hypr/.config/hypr/env.conf.template b/hypr/.config/hypr/env.conf.template
deleted file mode 100644
index 2069314..0000000
--- a/hypr/.config/hypr/env.conf.template
+++ /dev/null
@@ -1 +0,0 @@
-$HYPR_MONITOR_SETUP = ~/.config/hypr/modules/monitor_setup_0_auto.conf
diff --git a/hypr/.config/hypr/env.sh.template b/hypr/.config/hypr/env.sh.template
deleted file mode 100755
index 69607e4..0000000
--- a/hypr/.config/hypr/env.sh.template
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export HYPR_WALLPAPER_LINK_SOURCE="$HOME/nextcloud/Photos/Wallpapers"
-export HYPR_WALLPAPER_LINK="$HOME/.config/wpaperd/wallpapers/linked"
-
-ln -sf "$HYPR_WALLPAPER_LINK_SOURCE" "$HYPR_WALLPAPER_LINK"
diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
deleted file mode 100644
index 417fbbd..0000000
--- a/hypr/.config/hypr/hyprland.conf
+++ /dev/null
@@ -1,470 +0,0 @@
-# #######################################################################################
-# AUTOGENERATED HYPRLAND CONFIG.
-# EDIT THIS CONFIG ACCORDING TO THE WIKI INSTRUCTIONS.
-# #######################################################################################
-
-
-
-# This is an example Hyprland config file.
-# Refer to the wiki for more information.
-# https://wiki.hypr.land/Configuring/
-
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-
-# You can split this configuration into multiple files
-# Create your files separately and then link them to this file like this:
-# source = ~/.config/hypr/myColors.conf
-
-source = ~/.config/hypr/env.conf
-exec = bash ~/.config/hypr/env.sh
-
-
-################
-### MONITORS ###
-################
-
-enable_color_management = true
-
-# See https://wiki.hypr.land/Configuring/Monitors/
-# monitor=,preferred,auto,auto
-
-source = $HYPR_MONITOR_SETUP
-# source = ~/.config/hypr/modules/monitor_setup_buntes_monster.conf
-
-# unscale XWayland
-xwayland {
-  force_zero_scaling = true
-}
-
-
-###################
-### MY PROGRAMS ###
-###################
-
-# See https://wiki.hypr.land/Configuring/Keywords/
-
-# Set programs that you use
-$terminal = kitty
-$fileManager = dolphin
-#$menu = hyprlauncher
-$menu = wofi --show drun
-
-
-#################
-### AUTOSTART ###
-#################
-
-# Autostart necessary processes (like notifications daemons, status bars, etc.)
-# Or execute your favorite apps at launch like this:
-
-# exec = bash ~/.config/wpaperd/link_wallpapers.sh
-exec-once = waybar & 
-# exec-one = hyprpaper &
-exec-once = wpaperd &
-exec-once = swaync &
-exec-once = hypridle &
-exec-once = nextcloud &
-exec-once = sh ~/.config/hypr/scripts/portal-host-override.sh
-exec-once = sh ~/.config/hypr/scripts/ensure-mime-defaults.sh
-# exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE XDG_MENU_PREFIX
-# exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE XDG_MENU_PREFIX
-
-# exec = gsettings set org.gnome.desktop.interface gtk-theme "Breeze-Dark"   # for GTK3 apps
-# exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"   # for GTK4 apps
-
-# env = QT_QPA_PLATFORMTHEME,qt6ct   # for Qt apps
-
-
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-# See https://wiki.hypr.land/Configuring/Environment-variables/
-
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_SIZE,24
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_MENU_PREFIX,plasma-
-env = GTK_USE_PORTAL,1
-env = GTK_THEME,Adwaita:dark
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_QPA_PLATFORMTHEME,kde
-# env = QT_AUTO_SCREEN_SCALE_FACTOR,0.75
-# env = QT_SCALE_FACTOR,0.75
-# env = GDK_SCALE,1.5
-# env = GDK_DPI_SCALE,0.75
-
-###################
-### PERMISSIONS ###
-###################
-
-# See https://wiki.hypr.land/Configuring/Permissions/
-# Please note permission changes here require a Hyprland restart and are not applied on-the-fly
-# for security reasons
-
-# ecosystem {
-#   enforce_permissions = 1
-# }
-
-# permission = /usr/(bin|local/bin)/grim, screencopy, allow
-# permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow
-# permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
-
-
-#####################
-### COLOR SCHEMES ###
-#####################
-
-source=themes/mocha.conf
-$color_active_border = rgba($sapphireAlphaee)
-$color_inactive_border = rgba($surface1Alphaee)
-$color_decoration_shadow = rgba($sapphireAlphaee) 
-
-#####################
-### LOOK AND FEEL ###
-#####################
-
-# Refer to https://wiki.hypr.land/Configuring/Variables/
-
-# https://wiki.hypr.land/Configuring/Variables/#general
-general {
-    gaps_in = 3
-    gaps_out = 4
-
-    border_size = 3
-
-    # https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors
-    col.active_border = $color_active_border     
-    col.inactive_border = $color_inactive_border
-
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = true
-
-    # Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on
-    allow_tearing = false
-
-    layout = dwindle
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#decoration
-decoration {
-    rounding = 5
-    rounding_power = 2
-
-    # Change transparency of focused and unfocused windows
-    active_opacity = 1.00
-    inactive_opacity = 1.00
-
-    shadow {
-        enabled = true
-        range = 10
-        render_power = 3
-        color = $color_decoration_shadow
-    }
-
-    # https://wiki.hypr.land/Configuring/Variables/#blur
-    blur {
-        enabled = true
-        size = 10
-        passes = 2
-
-        vibrancy = 0.1696
-    }
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#animations
-animations {
-    enabled = true
-
-    # Default curves, see https://wiki.hypr.land/Configuring/Animations/#curves
-    #        NAME,           X0,   Y0,   X1,   Y1
-    bezier = easeOutQuint,   0.23, 1,    0.32, 1
-    bezier = easeInOutCubic, 0.65, 0.05, 0.36, 1
-    bezier = linear,         0,    0,    1,    1
-    bezier = almostLinear,   0.5,  0.5,  0.75, 1
-    bezier = quick,          0.15, 0,    0.1,  1
-
-    # Default animations, see https://wiki.hypr.land/Configuring/Animations/
-    #           NAME,          ONOFF, SPEED, CURVE,        [STYLE]
-    animation = global,        1,     10,    default
-    animation = border,        1,     5.39,  easeOutQuint
-    animation = windows,       1,     4.79,  easeOutQuint
-    animation = windowsIn,     1,     4.1,   easeOutQuint, popin 87%
-    animation = windowsOut,    1,     1.49,  linear,       popin 87%
-    animation = fadeIn,        1,     1.73,  almostLinear
-    animation = fadeOut,       1,     1.46,  almostLinear
-    animation = fade,          1,     3.03,  quick
-    animation = layers,        1,     3.81,  easeOutQuint
-    animation = layersIn,      1,     4,     easeOutQuint, fade
-    animation = layersOut,     1,     1.5,   linear,       fade
-    animation = fadeLayersIn,  1,     1.79,  almostLinear
-    animation = fadeLayersOut, 1,     1.39,  almostLinear
-    animation = workspaces,    1,     1.94,  almostLinear, fade
-    animation = workspacesIn,  1,     1.21,  almostLinear, fade
-    animation = workspacesOut, 1,     1.94,  almostLinear, fade
-    animation = zoomFactor,    1,     7,     quick
-}
-
-# Ref https://wiki.hypr.land/Configuring/Workspace-Rules/
-# "Smart gaps" / "No gaps when only"
-# uncomment all if you wish to use that.
-workspace = w[tv1], gapsout:0, gapsin:0
-workspace = f[1], gapsout:0, gapsin:0
-windowrule {
-    name = no-gaps-wtv1
-    match:float = false
-    match:workspace = w[tv1]
-
-    border_size = 0
-    rounding = 0
-}
-
-windowrule {
-    name = no-gaps-f1
-    match:float = false
-    match:workspace = f[1]
-
-    border_size = 0
-    rounding = 0
-}
-
-# See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
-dwindle {
-    preserve_split = true # You probably want this
-}
-
-# See https://wiki.hypr.land/Configuring/Master-Layout/ for more
-master {
-    new_status = master
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#misc
-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. :(
-}
-
-
-#############
-### INPUT ###
-#############
-
-# https://wiki.hypr.land/Configuring/Variables/#input
-input {
-    kb_layout = de
-    kb_variant =
-    kb_model =
-    kb_options = grp:alt_shift_toggle
-    kb_rules = 
-
-    follow_mouse = 1
-    
-    numlock_by_default = true
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-    touchpad {
-        natural_scroll = true
-    }
-}
-
-# See https://wiki.hypr.land/Configuring/Gestures
-gesture = 3, horizontal, workspace
-
-# Example per-device config
-# See https://wiki.hypr.land/Configuring/Keywords/#per-device-input-configs for more
-device {
-    name = epic-mouse-v1
-    sensitivity = -0.5
-}
-
-
-###################
-### KEYBINDINGS ###
-###################
-
-# See https://wiki.hypr.land/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
-
-# Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
-bind = $mainMod, RETURN, exec, $terminal
-bind = $mainMod, Q, killactive,
-bind = $mainMod, ESCAPE, exec, hyprshutdown
-bind = $mainMod SHIFT, ESCAPE, exec, command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch exit
-bind = $mainMod CTRL, ESCAPE, exec, hyprshutdown -t 'Shutting down...' --post-cmd 'shutdown -P 0'
-bind = $mainMod ALT, ESCAPE, exec, hyprshutdown -t 'Restarting...' --post-cmd 'reboot' 
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, SPACE, exec, $menu
-bind = $mainMod SHIFT, SPACE, exec, nwg-drawer
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod SHIFT, J, layoutmsg, togglesplit # dwindle
-bind = $mainMod, I, exec, firefox &
-bind = $mainMod, n, exec, ~/.local/bin/hyprltm-net
-
-# Move focus with mainMod + WASD or Vim-style
-bind = $mainMod, h, movefocus, l
-bind = $mainMod, l, movefocus, r
-bind = $mainMod, k, movefocus, u
-bind = $mainMod, j, movefocus, d
-
-# Move windows with mainMod + WASD or Vim-style
-bind = $mainMod SHIFT, a, movewindow, l
-bind = $mainMod SHIFT, d, movewindow, r
-bind = $mainMod SHIFT, w, movewindow, u
-bind = $mainMod SHIFT, s, movewindow, d
-bind = $mainMod SHIFT, h, movewindow, l
-bind = $mainMod SHIFT, l, movewindow, r
-bind = $mainMod SHIFT, k, movewindow, u
-bind = $mainMod SHIFT, j, movewindow, d
-
-# Resize focused window with mainMod + Arrows
-bind = $mainMod, left, resizeactive, -10 0
-bind = $mainMod, right, resizeactive, 10 0
-bind = $mainMod, up, resizeactive, 0 -10
-bind = $mainMod, down, resizeactive, 0 10
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-binde = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+
-bindl = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-# # Example special workspace (scratchpad)
-# bind = $mainMod, S, togglespecialworkspace, magic
-# bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Laptop multimedia keys for volume and LCD brightness
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
-
-# Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
-
-# Screenshots
-$screenshot_folder = ~/Bilder/Screenshots/
-bindl = , PRINT, exec, hyprshot -m region --output-folder $screenshot_folder
-bindl = LCTRL, PRINT, exec, hyprshot -m window --output-folder $screenshot_folder 
-bindl = SHIFT, PRINT, exec, hyprshot -m active --output-folder $screenshot_folder
-
-# Screenlock
-bindl = LCTRL ALT, L, exec, hyprlock
-
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hypr.land/Configuring/Window-Rules/ for more
-# See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
-
-# Example windowrules that are useful
-
-windowrule {
-    # Ignore maximize requests from all apps. You'll probably like this.
-    name = suppress-maximize-events
-    match:class = .*
-
-    suppress_event = maximize
-}
-
-windowrule {
-    # Fix some dragging issues with XWayland
-    name = fix-xwayland-drags
-    match:class = ^$
-    match:title = ^$
-    match:xwayland = true
-    match:float = true
-    match:fullscreen = false
-    match:pin = false
-
-    no_focus = true
-}
-
-# Hyprland-run windowrule
-windowrule {
-    name = move-hyprland-run
-
-    match:class = hyprland-run
-
-    move = 20 monitor_h-120
-    float = yes
-}
-
-windowrule {
-	name = opacity-kitty-dolphin
-	match:class = .*(kitty|dolphin).*
-	opacity = 0.90 0.80
-}
-
-layerrule = blur on, ignore_alpha 0.30, match:namespace waybar
-layerrule = blur_popups on, match:namespace waybar
-
-decoration {
-  blur {
-    size = 8
-    passes = 2
-  }
-}
-
-windowrule {
-  name = no-rounding-fullscreen
-  match:fullscreen = 1
-  rounding = 0
-  border_size = 0
-}
-
-# windowrule {
-#   name = no-rounding-steam-games
-#   match:class = ^steam_app_.*$
-#   rounding = 0
-#   border_size = 0
-# }
-
-# windowrule {
-#   name = no-rounding-gamescope
-#   match:class = ^gamescope$
-#   rounding = 0
-#   border_size = 0
-# }
-
-# HyprMod managed settings
-source = /home/mathias/.config/hypr/hyprland-gui.conf