diff --git a/.Xresources b/.Xresources
deleted file mode 100644
index b5c9c89..0000000
--- a/.Xresources
+++ /dev/null
@@ -1,12 +0,0 @@
-! Dark
-
-#define S_base03        #002b36
-#define S_base02        #073642
-#define S_base01        #586e75
-#define S_base00        #657b83
-#define S_base0         #839496
-#define S_base1         #93a1a1
-#define S_base2         #eee8d5
-#define S_base3         #fdf6e3
-
-#include ".config/Xresources.common"
diff --git a/.Xresources b/.Xresources
new file mode 120000
index 0000000..7bc5101
--- /dev/null
+++ b/.Xresources
@@ -0,0 +1 @@
+.config/Xresources.dark
\ No newline at end of file
diff --git a/.config/i3/config b/.config/i3/config
index 667fef2..e8b4756 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -167,7 +167,6 @@ bindsym $mod+Shift+e exec "i3-nagbar -f 'pango:$font' -t warning -m 'i3 beenden?
 bindsym $mod+Return exec --no-startup-id termite
 bindsym $mod+c exec --no-startup-id firefox
 bindsym $mod+t exec --no-startup-id thunderbird
-bindsym $mod+p exec --no-startup-id termite -t Profanity -e profanity
 bindsym $mod+g exec --no-startup-id code
 bindsym XF86Explorer exec --no-startup-id thunar
 
@@ -191,7 +190,6 @@ bindsym XF86Display exec --no-startup-id /usr/local/bin/monitor
 # ------------------------------------------------------------------------------
 # Assignment of progrmans to workspaces
 # ------------------------------------------------------------------------------
-assign [class="^Termite$" title="^Profanity$"] $workspace4
 assign [class="^Termite$"] $workspace1
 assign [class="^Subl3$"] $workspace2
 assign [class="^Code$"] $workspace2
@@ -271,11 +269,12 @@ gaps inner 10
 # compositor
 exec --no-startup-id compton
 
-# backgorund
+# background
 exec --no-startup-id feh --bg-fill /usr/share/backgrounds/custom/mountain.jpg
 
-# NetworkManager Applet
+# applets
 exec --no-startup-id nm-applet
+exec --no-startup-id cbatticon
 
 # ------------------------------------------------------------------------------
 # Workspace bar
@@ -293,5 +292,5 @@ bar {
         inactive_workspace $color_bg_focused $color_bg_focused $color_fg_unfocused
         urgent_workspace   $color_bg_focused $color_bg_focused $color_red
     }
-        status_command i3blocks -c ~/.i3blocks.conf
+    status_command i3blocks -c ~/.i3blocks.conf
 }
diff --git a/.config/sway/config b/.config/sway/config
index 7b6b02d..e01cf55 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -158,16 +158,16 @@ bindsym $mod+Mod1+Right move workspace to output right
 bindsym $mod+Mod1+Left move workspace to output left
 
 # ------------------------------------------------------------------------------
-# i3 management
+# sway management
 # ------------------------------------------------------------------------------
 # reload the configuration file
 bindsym $mod+Shift+c reload
 
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+# restart sway inplace (preserves your layout/session, can be used to upgrade sway)
 bindsym $mod+Shift+r restart
 
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -f 'pango:$font' -t warning -m 'i3 beenden?' -b 'Ja' 'i3-msg exit'"
+# exit sway (logs you out of your Wayland session)
+bindsym $mod+Shift+e exec "swaynag -f 'pango:$font' -t warning -m 'sway beenden?' -b 'Ja' 'swaymsg exit'"
 
 # ------------------------------------------------------------------------------
 # Program shortcuts
@@ -175,7 +175,6 @@ bindsym $mod+Shift+e exec "i3-nagbar -f 'pango:$font' -t warning -m 'i3 beenden?
 bindsym $mod+Return exec --no-startup-id termite
 bindsym $mod+c exec --no-startup-id firefox
 bindsym $mod+t exec --no-startup-id thunderbird
-bindsym $mod+p exec --no-startup-id termite -t Profanity -e profanity
 bindsym $mod+g exec --no-startup-id code
 bindsym XF86Explorer exec --no-startup-id thunar
 
@@ -199,7 +198,6 @@ bindsym XF86Display exec --no-startup-id /usr/local/bin/monitor
 # ------------------------------------------------------------------------------
 # Assignment of progrmans to workspaces
 # ------------------------------------------------------------------------------
-assign [class="^Termite$" title="^Profanity$"] $workspace4
 assign [class="^Termite$"] $workspace1
 assign [class="^Subl3$"] $workspace2
 assign [class="^Code$"] $workspace2
@@ -282,6 +280,10 @@ exec --no-startup-id compton
 # backgorund
 exec --no-startup-id feh --bg-fill /usr/share/backgrounds/custom/mountain.jpg
 
+# applets
+exec --no-startup-id nm-applet
+exec --no-startup-id cbatticon
+
 # ------------------------------------------------------------------------------
 # Workspace bar
 # ------------------------------------------------------------------------------
@@ -298,5 +300,5 @@ bar {
         inactive_workspace $color_bg_focused $color_bg_focused $color_fg_unfocused
         urgent_workspace   $color_bg_focused $color_bg_focused $color_red
     }
-        status_command i3blocks -c ~/.i3blocks.conf
+    status_command i3blocks -c ~/.i3blocks.conf
 }