diff --git a/.config/environment.d/50-wayland.conf b/.config/environment.d/50-wayland.conf
index d14fd75..c924f63 100644
--- a/.config/environment.d/50-wayland.conf
+++ b/.config/environment.d/50-wayland.conf
@@ -14,4 +14,3 @@ QT_QPA_PLATFORMTHEME=qt5ct
 
 # Enable wayland for firefox and thunderbird
 MOZ_ENABLE_WAYLAND=1
-
diff --git a/.config/sway/conf.d/1-set b/.config/sway/conf.d/1-set
index e769f5e..5e370db 100644
--- a/.config/sway/conf.d/1-set
+++ b/.config/sway/conf.d/1-set
@@ -1,4 +1,3 @@
-
 # ================= #
 # Variable settings #
 # ================= #
@@ -22,7 +21,6 @@ set $disp2 DP-1
 set $disp3 DP-2
 
 ## Define inputs
-#set $keyboard1 1547:8979:Skydigital_nkey_Mechanic_LED_Keyboard
 set $mouse1 7119:5:USB_Optical_Mouse
 
 ## Define Workspaces
@@ -49,4 +47,3 @@ set $wsF9   19: 
 set $wsF10  20:20
 set $wsF11  21:  
 set $wsF12  22:22
-
diff --git a/.config/sway/conf.d/2-assigns b/.config/sway/conf.d/2-assigns
index 008e903..fef9817 100644
--- a/.config/sway/conf.d/2-assigns
+++ b/.config/sway/conf.d/2-assigns
@@ -1,4 +1,3 @@
-
 # ===================================== #
 # Assign programs to default workspaces #
 # ===================================== #
@@ -43,4 +42,3 @@ workspace $wsF9   output $disp3
 workspace $wsF10  output $disp3
 workspace $wsF11  output $disp3
 workspace $wsF12  output $disp3
-
diff --git a/.config/sway/conf.d/3-appearance b/.config/sway/conf.d/3-appearance
index bf1aa4b..390b519 100644
--- a/.config/sway/conf.d/3-appearance
+++ b/.config/sway/conf.d/3-appearance
@@ -1,4 +1,3 @@
-
 # =================== #
 # Appearance settings #
 # =================== #
@@ -24,4 +23,3 @@ exec_always {
     gsettings set $gnome-schema cursor-theme 'Breeze_Snow'
     gsettings set $gnome-schema font-name 'Iosevka Nerd Font Mono'
 }
-
diff --git a/.config/sway/conf.d/autoruns b/.config/sway/conf.d/autoruns
index eff40d2..0e57b6f 100644
--- a/.config/sway/conf.d/autoruns
+++ b/.config/sway/conf.d/autoruns
@@ -1,4 +1,3 @@
-
 # ================ #
 # Autorun settings #
 # ================ #
@@ -7,16 +6,11 @@
 exec_always /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 
 # Make sure the systemd user session gets all envs
-exec_always "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP SWAYSOCK"
 exec_always "dbus-update-activation-environment --all --systemd"
 
-# Not needed if started via Systemd
-#exec eval $(gnome-keyring-daemon --start)
-
 # Autostart applets
 exec nm-applet --indicator
 
 # Autostart my daily use software
 exec thunderbird
 exec evolution
-
diff --git a/.config/sway/conf.d/bar b/.config/sway/conf.d/bar
index b0cf63e..a9d77b5 100644
--- a/.config/sway/conf.d/bar
+++ b/.config/sway/conf.d/bar
@@ -1,9 +1,7 @@
-
 # ============ #
 # Bar settings #
 # ============ #
 
 bar {
-    swaybar_command waybar
+  swaybar_command waybar
 }
-
diff --git a/.config/sway/conf.d/input b/.config/sway/conf.d/input
index 057ce6d..2cda1d1 100644
--- a/.config/sway/conf.d/input
+++ b/.config/sway/conf.d/input
@@ -1,4 +1,3 @@
-
 # =================== #
 # Input configuration #
 # =================== #
@@ -15,4 +14,3 @@ input $mouse1 {
     dwt disabled
     scroll_factor 0.5
 }
-
diff --git a/.config/sway/conf.d/keybinds b/.config/sway/conf.d/keybinds
index 16373c4..8cef1d0 100644
--- a/.config/sway/conf.d/keybinds
+++ b/.config/sway/conf.d/keybinds
@@ -1,4 +1,3 @@
-
 # ============ #
 # Key bindings #
 # ============ #
@@ -174,7 +173,6 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
-
 ## Mediakeys keybinds
 bindsym --locked XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ +5%
 bindsym --locked XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SINK@ -5%
@@ -183,4 +181,3 @@ bindsym --locked XF86AudioMute exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 bindsym --locked $mod+XF86AudioRaiseVolume exec wpctl set-volume @DEFAULT_AUDIO_SOURCE@ +5%
 bindsym --locked $mod+XF86AudioLowerVolume exec wpctl set-volume @DEFAULT_AUDIO_SOURCE@ -5%
 bindsym --locked $mod+XF86AudioMute exec wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-
diff --git a/.config/sway/conf.d/launcher b/.config/sway/conf.d/launcher
index 0b7461d..c94f382 100644
--- a/.config/sway/conf.d/launcher
+++ b/.config/sway/conf.d/launcher
@@ -1,9 +1,6 @@
-
 # ================= #
 # Launcher settings #
 # ================= #
 
-#set $menu wofi --show drun | xargs swaymsg exec --
 set $menu fuzzel | xargs swaymsg exec --
 set $pass_menu tessen
-
diff --git a/.config/sway/conf.d/output b/.config/sway/conf.d/output
index 5804a3a..149d507 100644
--- a/.config/sway/conf.d/output
+++ b/.config/sway/conf.d/output
@@ -1,4 +1,3 @@
-
 # ==================== #
 # Output configuration #
 # ==================== #
@@ -19,4 +18,3 @@ output $disp3 {
     position 3000,550
     bg ~/.config/sway/backgrounds/Nyarch_Wallpaper.png fill
 }
-
diff --git a/.config/sway/conf.d/window-rules b/.config/sway/conf.d/window-rules
index c500ee8..d7ff556 100644
--- a/.config/sway/conf.d/window-rules
+++ b/.config/sway/conf.d/window-rules
@@ -1,4 +1,3 @@
-
 # ================== #
 # Setup window rules #
 # ================== #
@@ -32,4 +31,3 @@ for_window {
 
   [app_id="showmethekey-gtk"] floating enable; sticky enable
 }
-