diff --git a/simpleDots/i3+gpdp2/alternating_layouts.py b/simpleDots/i3+gpdp2/alternating_layouts.py
deleted file mode 100755
index d38d2ca..0000000
--- a/simpleDots/i3+gpdp2/alternating_layouts.py
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-
-import i3
-import re
-import subprocess
-import getopt
-import sys
-import os
-
-
-def find_parent(window_id):
-    """
-        Find the parent of a given window id
-    """
-    root_window = i3.get_tree()
-    result = [None]
-
-    def finder(n, p=None):
-        if result[0] is not None:
-            return
-        for node in n:
-            if node['id'] == window_id:
-                result[0] = p
-                return
-            if len(node['nodes']):
-                finder(node['nodes'], node)
-
-    finder(root_window['nodes'])
-    return result[0]
-
-
-def set_layout():
-    """
-        Set the layout/split for the currently
-        focused window to either vertical or
-        horizontal, depending on its width/height
-    """
-    current_win = i3.filter(nodes=[], focused=True)
-    for win in current_win:
-        parent = find_parent(win['id'])
-
-        if (parent and "rect" in parent
-                   and parent['layout'] != 'tabbed'
-                   and parent['layout'] != 'stacked'):
-            height = parent['rect']['height']
-            width = parent['rect']['width']
-
-            if height > width:
-                new_layout = 'vertical'
-            else:
-                new_layout = 'horizontal'
-
-            i3.split(new_layout)
-
-
-def print_help():
-    print("Usage: " + sys.argv[0] + " [-p path/to/pid.file]")
-    print("")
-    print("Options:")
-    print("    -p path/to/pid.file   Saves the PID for this program in the filename specified")
-    print("")
-
-
-def main():
-    """
-        Main function - listen for window focus
-        changes and call set_layout when focus
-        changes
-    """
-    opt_list, args = getopt.getopt(sys.argv[1:], 'hp:')
-    pid_file = None
-    for opt in opt_list:
-        if opt[0] == "-h":
-            print_help()
-            sys.exit()
-        if opt[0] == "-p":
-            pid_file = opt[1]
-
-    if pid_file:
-        with open(pid_file, 'w') as f:
-            f.write(str(os.getpid()))
-
-
-    process = subprocess.Popen(
-        ['xprop', '-root', '-spy'],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE
-    )
-    regex = re.compile(b'^_NET_CLIENT_LIST_STACKING|^_NET_ACTIVE_WINDOW')
-
-    last_line = ""
-    while True:
-        line = process.stdout.readline()
-        if line == b'': #X is dead
-            break
-        if line == last_line:
-            continue
-        if regex.match(line):
-            set_layout()
-        last_line = line
-
-    process.kill()
-    sys.exit()
-
-if __name__ == "__main__":
-    main()
diff --git a/simpleDots/i3+gpdp2/config b/simpleDots/i3+gpdp2/config
deleted file mode 100644
index d56d47b..0000000
--- a/simpleDots/i3+gpdp2/config
+++ /dev/null
@@ -1,280 +0,0 @@
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-set $alt Mod1
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-#font pango:Terminus 8
-font pango:B612Mono 8
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-#font pango:DejaVu Sans Mono 8
-
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
-# Color theme
-## class                 border  backgr. text    indicator child_border
-#client.focused          #4c7899 #285577 #ffffff #2e9ef4   #285577
-#client.focused_inactive #333333 #5f676a #ffffff #484e50   #5f676a
-#client.unfocused        #333333 #222222 #888888 #292d2e   #222222
-#client.urgent           #2f343a #900000 #ffffff #900000   #900000
-#client.placeholder      #000000 #0c0c0c #ffffff #000000   #0c0c0c
-#client.background       #ffffff
-
-## Green theme
-client.focused           #77994B #547628 #EEEEEE #41FF00
-client.focused_inactive  #333333 #5F676A #EEEEEE #333333
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
-
-# kill focused window
-bindsym $mod+Shift+c kill
-
-# start dmenu (a program launcher)
-#bindsym $mod+d exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-bindsym $mod+d exec --no-startup-id "i3-dmenu-desktop --entry-type name"
-
-# Local Hotkeys
-bindsym $mod+x exec --no-startup-id "test -x ~/.local/bin/lhotkey-x && ~/.local/bin/lhotkey-x"
-bindsym $mod+y exec --no-startup-id "test -x ~/.local/bin/lhotkey-y && ~/.local/bin/lhotkey-y"
-bindsym $mod+F1 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F01 && ~/.local/bin/lhotkey-F01"
-bindsym $mod+F2 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F02 && ~/.local/bin/lhotkey-F02"
-bindsym $mod+F3 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F03 && ~/.local/bin/lhotkey-F03"
-bindsym $mod+F4 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F04 && ~/.local/bin/lhotkey-F04"
-bindsym $mod+F5 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F05 && ~/.local/bin/lhotkey-F05"
-bindsym $mod+F6 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F06 && ~/.local/bin/lhotkey-F06"
-bindsym $mod+F7 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F07 && ~/.local/bin/lhotkey-F07"
-bindsym $mod+F8 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F08 && ~/.local/bin/lhotkey-F08"
-bindsym $mod+F9 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F09 && ~/.local/bin/lhotkey-F09"
-bindsym $mod+F10 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F10 && ~/.local/bin/lhotkey-F10"
-bindsym $mod+F11 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F11 && ~/.local/bin/lhotkey-F11"
-bindsym $mod+F12 exec --no-startup-id "test -x ~/.local/bin/lhotkey-F12 && ~/.local/bin/lhotkey-F12"
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+odiaeresis focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+odiaeresis move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# move the whole workspace to an other display
-bindsym $mod+$alt+Left move workspace to output left
-bindsym $mod+$alt+Right move workspace to output right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# switch to workspace
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-bindsym $mod+6 workspace 6
-bindsym $mod+7 workspace 7
-bindsym $mod+8 workspace 8
-bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8
-bindsym $mod+Shift+9 move container to workspace 9
-bindsym $mod+Shift+0 move container to workspace 10
-
-# reload the configuration file
-#bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-  # These bindings trigger as soon as you enter the resize mode
-
-  # Pressing left will shrink the window’s width.
-  # Pressing right will grow the window’s width.
-  # Pressing up will shrink the window’s height.
-  # Pressing down will grow the window’s height.
-  bindsym j resize shrink width 10 px or 10 ppt
-  bindsym k resize grow height 10 px or 10 ppt
-  bindsym l resize shrink height 10 px or 10 ppt
-  bindsym odiaeresis resize grow width 10 px or 10 ppt
-
-  # same bindings, but for the arrow keys
-  bindsym Left resize shrink width 10 px or 10 ppt
-  bindsym Down resize grow height 10 px or 10 ppt
-  bindsym Up resize shrink height 10 px or 10 ppt
-  bindsym Right resize grow width 10 px or 10 ppt
-
-  # back to normal: Enter or Escape
-  bindsym Return mode "default"
-  bindsym Escape mode "default"
-}
-bindsym $mod+r mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-  colors {
-    #background #222222
-    #statusline #eeeeee
-    #separator #666666
-    ##                  border  backgr. text
-    #focused_workspace  #4c7899 #285577 #ffffff
-    #active_workspace   #333333 #5f676a #ffffff
-    #inactive_workspace #333333 #222222 #888888
-    #urgent_workspace   #2f343a #900000 #ffffff
-
-    ## Green Theme
-    focused_workspace  #77994B #547628 #EEEEEE #41FF00
-  }
-  status_command i3status  --config ~/.i3/i3-status.conf
-  position top
-}
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id "pulsemixer --change-volume +5"
-bindsym XF86AudioLowerVolume exec --no-startup-id "pulsemixer --change-volume -5"
-bindsym XF86AudioMute exec --no-startup-id "pulsemixer --toggle-mute"
-
-# Sreen brightness controls
-bindsym XF86MonBrightnessUp exec xbacklight -inc 5
-bindsym XF86MonBrightnessDown exec xbacklight -dec 5
-
-# Toggle WiFi
-# [ _$(nmcli radio wifi) == _enabled ] && nmcli radio wifi off || nmcli radio wifi on
-
-# Screenlock
-bindsym $alt+Ctrl+l exec "~/.bin/screenlock.sh"
-bindsym XF86Sleep exec "~/.bin/screenlock.sh"
-exec --no-startup-id xautolock -time 15 -locker "~/.bin/screenlock.sh" &
-
-# quick terminal
-bindsym $mod+$alt+Shift+F1 exec --no-startup-id $TERMINAL -name metask -e bash -o ignoreeof
-exec --no-startup-id $TERMINAL -name metask -e bash -o ignoreeof
-for_window [instance="metask"] floating enable;
-for_window [instance="metask"] move scratchpad; \
-           [instance="metask"] scratchpad show; \
-           move position 0px 22px; \
-           resize shrink height 150px; \
-           resize grow width 683px; \
-           move scratchpad
-bindsym F1 [instance="metask"] scratchpad show
-
-# Touchpad controls
-#bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
-
-# Media player controls
-#bindsym XF86AudioPlay exec playerctl play
-#bindsym XF86AudioPause exec playerctl pause
-#bindsym XF86AudioNext exec playerctl next
-#bindsym XF86AudioPrev exec playerctl previous
-
-# Misc keybindings
-bindsym --release Print exec "scrot --select"
-bindsym $mod+c exec free42
-bindsym $mod+XF86Calc exec free42
-bindsym $mod+b exec ~/.bin/startBrowser.sh
-bindsym $mod+$alt+b exec ~/.bin/startAltBrowser.sh
-bindsym $mod+n exec ~/.bin/startBrowserPrivat.sh
-bindsym $mod+$alt+n exec ~/.bin/startAltBrowserPrivat.sh
-bindsym $mod+m exec ~/.bin/dmenu_dir2menu.sh ~/.screenlayout/
-bindsym $mod+t exec ~/.bin/themer
-
-# Get current public IP or restart a fritz.box connection
-bindsym $mod+i exec --no-startup-id notify-send "Public IP address" "$(curl https://canihazip.com/s)"
-bindsym $mod+Shift+i exec --no-startup-id "~/.bin/reconnectfritzbox.sh"
-
-# Get current uptime
-bindsym $mod+u exec --no-startup-id notify-send "Uptime" "$(uptime --pretty)"
-bindsym $mod+Shift+u exec --no-startup-id test -x ~/.local/bin/mod-u && ~/.local/bin/mod-u
-
-# Clipboard to QR
-bindsym $mod+q exec --no-startup-id "~/.bin/xcqr"
-
-exec --no-startup-id  "blueman-applet"
-exec --no-startup-id  "nm-applet"
-exec --no-startup-id  "parcellite"
-exec --no-startup-id  "dunst -config ~/.i3/dunstrc"
-exec --no-startup-id test -x ~/.local/bin/i3autostart.sh && ~/.local/bin/i3autostart.sh
-exec --no-startup-id gsettings set org.gtk.Settings.FileChooser sort-directories-first true
-
-## Spirallayout for new windows
-exec_always --no-startup-id ~/.i3/alternating_layouts.py
-
-## Window Config
-for_window [class="Argon"] floating enable
-for_window [class="Vlc"] floating enable
-for_window [class="Ghidra"] floating enable
-for_window [title="^CSSH.*"] floating enable
-for_window [title="Formula editor"] floating enable
-for_window [title="Wfica"] fullscreen disable
-for_window [title="Microsoft Teams-Benachrichtigung"] floating enable
-
-## Juggle Windows
-workspace 10 output HDMI2
-assign [class="^Wfica$"] 10
diff --git a/simpleDots/i3+gpdp2/dunstrc b/simpleDots/i3+gpdp2/dunstrc
deleted file mode 100644
index 81f3810..0000000
--- a/simpleDots/i3+gpdp2/dunstrc
+++ /dev/null
@@ -1,48 +0,0 @@
-[global]
-    font = Inconsolata 10
-    allow_markup = yes
-    format = "<b>%s</b>\n%b"
-    sort = yes
-    indicate_hidden = yes
-    alignment = right
-    bounce_freq = 0
-    show_age_threshold = 60
-    word_wrap = yes
-    ignore_newline = no
-    geometry = "200x5-6+30"
-    transparency = 0
-    idle_threshold = 120
-    monitor = 0
-    follow = mouse
-    sticky_history = yes
-    line_height = 0
-    separator_height = 2
-    padding = 8
-    horizontal_padding = 8
-    separator_color = "#585858"
-    startup_notification = false
-
-[frame]
-    width = 1
-    color = "#383838"
-
-[shortcuts]
-    close = ctrl+space
-    close_all = ctrl+shift+space
-    # history = ctrl+h
-    context = ctrl+shift+period
-
-[urgency_low]
-    background = "#181818"
-    foreground = "#E3C7AF"
-    timeout = 5
-
-[urgency_normal]
-    background = "#181818"
-    foreground = "#E3C7AF"
-    timeout = 20
-
-[urgency_critical]
-    background = "#181818"
-    foreground = "#FF2121"
-    timeout = 0
diff --git a/simpleDots/i3+gpdp2/i3-status.conf b/simpleDots/i3+gpdp2/i3-status.conf
deleted file mode 100644
index 5fbb102..0000000
--- a/simpleDots/i3+gpdp2/i3-status.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-	colors = true
-	interval = 2
-}
-
-order += "battery 0"
-#order += "disk /"
-order += "ipv6"
-order += "wireless _first_"
-order += "ethernet _first_"
-order += "cpu_temperature 0"
-order += "cpu_usage"
-#order += "load"
-order += "volume master"
-order += "tztime local"
-
-ipv6 {
-	format_down = ""
-}
-
-wireless _first_ {
-	format_up = "⚵ %ip (%quality at %essid)"
-	format_down = ""
-}
-
-ethernet _first_ {
-	## if you use %speed, i3status requires root privileges
-	format_up = "♆ %ip (%speed)"
-	format_down = ""
-}
-
-battery 0 {
-	format = "%status%percentage %remaining"
-	format_down = ""
-	status_chr = "⚡▴ "
-	status_bat = "⚡▾ "
-	status_full = "⚡ "
-	low_threshold = 30
-    threshold_type = time
-    hide_seconds = true
-    integer_battery_capacity = true
-}
-
-tztime local {
-	format = "KW%V %Y-%m-%d %H:%M"
-}
-
-load {
-	format = "📊 %1min %5min %15min"
-}
-
-cpu_usage {
-	format = "🚀 %usage"
-}
-
-cpu_temperature 0 {
-	format = "♨ %degrees °C"
-    path   = "~/.local/systemp"
-}
-
-disk "/" {
-	format = "/ %avail"
-    prefix_type = custom
-}
-
-volume master {
-	format = "♪ %volume"
-	format_muted = "♪ mute (%volume)"
-	device = "default"
-	mixer = "Master"
-	mixer_idx = 0
-}
diff --git a/simpleDots/i3/i3-status.conf b/simpleDots/i3/i3-status.conf
index 6d3dbd0..6dae735 100644
--- a/simpleDots/i3/i3-status.conf
+++ b/simpleDots/i3/i3-status.conf
@@ -11,7 +11,6 @@ general {
 	interval = 2
 }
 
-order += "battery 0"
 order += "disk /"
 order += "ipv6"
 order += "wireless _first_"
@@ -20,6 +19,7 @@ order += "cpu_temperature 0"
 order += "cpu_usage"
 order += "load"
 order += "volume master"
+order += "battery 0"
 order += "tztime local"
 
 ipv6 {
diff --git a/simpleDots/xprofile+gpdp2 b/simpleDots/xprofile+gpdp2
index 37fde00..9c5cd36 100644
--- a/simpleDots/xprofile+gpdp2
+++ b/simpleDots/xprofile+gpdp2
@@ -2,6 +2,9 @@
 eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export SSH_AUTH_SOCK
 
+## Import exports
+source ~/.exports
+
 ## Setup Keyboard
 xmodmap -e 'keycode  49 = Multi_key'        # Kanji-key
 xmodmap -e 'keycode 132 = grave asciitilde' # grave-key
@@ -9,11 +12,15 @@ xmodmap -e 'keycode  29 = z Z z Z'          # y-z
 xmodmap -e 'keycode  52 = y Y y Y'          # z-y
 
 ## Setup resources
-xrdb -merge ~/.Xresources
 test -f ~/.local/Xresources && xrdb -merge ~/.local/Xresources
-echo Dark > ~/.local/themer.state
 
 ## Setup Screen
 test -x ~/.screenlayout/.default && ~/.screenlayout/.default
 test -x ~/.fehbg && ~/.fehbg
 
+
+
+
+## Start Keyring-Daemon
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
diff --git a/sysconfig_arch/cfg_workstation.pp b/sysconfig_arch/cfg_workstation.pp
index 2969e41..cb139fb 100644
--- a/sysconfig_arch/cfg_workstation.pp
+++ b/sysconfig_arch/cfg_workstation.pp
@@ -11,6 +11,7 @@ service {'ctrl-alt-del.target':
 ## Lots of Packages...
 package {'acpi':                         ensure => installed}
 package {'alsa-utils':                   ensure => installed}
+package {'alacritty':                    ensure => installed}
 package {'arandr':                       ensure => installed}
 package {'aspell':                       ensure => installed}
 package {'aspell-de':                    ensure => installed}
diff --git a/sysconfig_arch/cfg_zz_gpdp2.pp b/sysconfig_arch/cfg_zz_gpdp2.pp
index 04d151e..7ca2180 100644
--- a/sysconfig_arch/cfg_zz_gpdp2.pp
+++ b/sysconfig_arch/cfg_zz_gpdp2.pp
@@ -46,6 +46,14 @@ file {'/etc/X11/xorg.conf.d/99-touchscreen.conf':
     mode    => '0644',
     source  => "puppet:///modules/gpdp2/etc/X11/xorg.conf.d/99-touchscreen.conf",
 }
+file {'/etc/X11/Xresources':
+    ensure  => file,
+    backup  => false,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    source  => "puppet:///modules/gpdp2/etc/X11/Xresources",
+}
 
 file {'/etc/modules-load.d/gpd-pocket-fan.conf':
     ensure  => file,
diff --git a/sysconfig_arch/modules/gpdp2/files/etc/X11/Xresources b/sysconfig_arch/modules/gpdp2/files/etc/X11/Xresources
new file mode 100644
index 0000000..bc795b9
--- /dev/null
+++ b/sysconfig_arch/modules/gpdp2/files/etc/X11/Xresources
@@ -0,0 +1 @@
+Xft.dpi: 200
diff --git a/sysconfig_arch/modules/gpdp2/files/etc/X11/xorg.conf.d/30-display.conf b/sysconfig_arch/modules/gpdp2/files/etc/X11/xorg.conf.d/30-display.conf
index 0f91938..5be0b26 100644
--- a/sysconfig_arch/modules/gpdp2/files/etc/X11/xorg.conf.d/30-display.conf
+++ b/sysconfig_arch/modules/gpdp2/files/etc/X11/xorg.conf.d/30-display.conf
@@ -1,4 +1,5 @@
 Section "Monitor"
     Identifier "eDP1"
     Option "Rotate" "right"
+    DisplaySize 151 95
 EndSection