diff --git a/README.md b/README.md
index 7240c77..01b8a90 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@ My personal configurations, managed with the 'dotdrop' submodule.
 + Distro: `Fedora 31`
 + Font: `InconsolataLGC Nerd Font Mono` and `Inconsolata` (polybar)
 + Shell: `zsh`
-+ Terminal: `alacritty` and `xterm`
++ Terminal: `alacritty`
 + Theme: `Nord`
 + Vim-Bar: `airline`
-+ WM: `i3-gaps` and `i3`
++ WM: `i3-gaps`
 
 ## Requirements
 + App Launcher: `rofi`
@@ -26,7 +26,7 @@ My personal configurations, managed with the 'dotdrop' submodule.
 + Browser: `firefox` with [minimal-fuctional-fox](https://github.com/mut-ex/minimal-functional-fox) and [nightTab](https://github.com/zombieFox/nightTab)
 + Filebrowser: `ranger`
 + Image-Viewer: `feh`
-+ Locking: `i3lock-color` and `xlock`
++ Locking: `i3lock-color`
 + Movie-Viewer: `mpv`
 + Music: `spotify` with [spicetify-cli](https://github.com/khanhas/spicetify-cli/)
 + Notifications: `dunst`
diff --git a/config.yaml b/config.yaml
index 4b1a3cc..a33f8f7 100644
--- a/config.yaml
+++ b/config.yaml
@@ -77,8 +77,8 @@ profiles:
     include:
     - zsh
     - vim
-    - x11
     - i3
+    - x11
     - font
     - compton
     - tmux
@@ -128,7 +128,6 @@ profiles:
     dotfiles:
     - f_xresources
     - d_xresources_themes
-    - f_xinitrc
   i3:
     dotfiles:
     - f_i3
diff --git a/dotfiles/X11/xinitrc b/dotfiles/X11/xinitrc
deleted file mode 100755
index 745892f..0000000
--- a/dotfiles/X11/xinitrc
+++ /dev/null
@@ -1,16 +0,0 @@
-xrdb -load $HOME/.Xresources
-export SHELL="/bin/zsh"
-
-setxkbmap -layout za
-
-export LANG="en_US.UTF-8"
-export LANGUAGE="en_US.UTF-8"
-
-{%@@ if profile == "work" @@%}
-export TERM="xterm-256color"
-/share/bin/isda
-~/bin/.keyboard.scm &
-xrandr --output HDMI-2 --auto --right-of HDMI-1
-compton &
-i3
-{%@@ endif @@%}
diff --git a/dotfiles/i3/config b/dotfiles/i3/config
index 793f1d3..c9d58b7 100644
--- a/dotfiles/i3/config
+++ b/dotfiles/i3/config
@@ -1,99 +1,76 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
 set $mod Mod4
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:Inconsolata 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
+# Font for Window Titles
+font pango:Inconsolata 8
 
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
-
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 
-# NetworkManager is the most popular way to manage wireless networks on Linux,
-# and nm-applet is a desktop environment-independent system tray GUI for it.
-exec --no-startup-id nm-applet
-
-# Use pactl to adjust volume in PulseAudio.
-set $refresh_i3status killall -SIGUSR1 i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2% && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-
-# Sound control
-bindsym XF86AudioPlay exec playerctl play
-bindsym XF86AudioPause exec playerctl pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
-
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# start a terminal
+### Keybinds ###
+#Terminal
 bindsym $mod+Return exec alacritty
 bindsym $mod+Ctrl+Return exec xterm
-# for_window [class="XTerm"] floating enable move right 450px,move down 350px
 
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# Rofi
-bindsym $mod+space exec "rofi -show"
-bindsym $mod+c exec "rofi -show ssh"
-
-# dmenu
-bindsym $mod+d exec "dmenu_run -fn 'InconsolataLGC Nerd Font Mono' -nb '#2E3440' -sb '#2E3440' -nf '#ECEFF4' -sf '#A3BE8C' -p 'ﰌ'"
-
-# change focus
+# Windows
 bindsym $mod+h focus left
 bindsym $mod+j focus down
 bindsym $mod+k focus up
 bindsym $mod+l focus right
 
-# move focused window
 bindsym $mod+Shift+h move left
 bindsym $mod+Shift+j move down
 bindsym $mod+Shift+k move up
 bindsym $mod+Shift+l move right
 
-# Splitting
-bindsym $mod+Shift+s split toggle
+bindsym $mod+Ctrl+l resize grow width 10 px
+bindsym $mod+Ctrl+h resize shrink width 10 px
+
+bindsym $mod+Shift+q kill
 
-# 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+a layout toggle split
-
-# toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
 
-# change focus between tiling / floating windows
-#bindsym $mod+space focus mode_toggle
+# Layout
+bindsym $mod+s layout stacking
+bindsym $mod+a layout toggle split
 
-# focus the child container
-#bindsym $mod+d focus child
+# Create splits just like in vim
+bindsym $mod+Shift+s split v
+bindsym $mod+Shift+v split h
 
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
+# Workspace Cycle
+bindsym $mod+n workspace next
+bindsym $mod+p workspace prev
+
+# Rofi and dmenu
+bindsym $mod+space exec "rofi -show"
+bindsym $mod+d exec "dmenu_run -fn 'InconsolataLGC Nerd Font Mono' -nb '#2E3440' -sb '#2E3440' -nf '#ECEFF4' -sf '#A3BE8C' -p 'ﰌ'"
+
+bindsym --release $mod+Shift+p exec"import ~/screenshots/Screenshot-$(date '+%Y%m%d-%H%M%S').png"
+
+# Screen brightness
+bindsym XF86MonBrightnessUp exec light -A 5 # increase
+bindsym XF86MonBrightnessDown exec light -U 5 # decrease
+
+# Volume
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +2%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -2%
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle
+
+# Sound Control
+bindsym XF86AudioPlay exec playerctl play
+bindsym XF86AudioPause exec playerctl pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+
+### Workspaces ###
 set $ws1 "1"
 set $ws2 "2"
 set $ws3 "3"
@@ -105,7 +82,7 @@ set $ws8 "8"
 set $ws9 "9"
 set $ws10 "10"
 
-# switch to workspace
+# Move to workspace
 bindsym $mod+1 workspace number $ws1
 bindsym $mod+2 workspace number $ws2
 bindsym $mod+3 workspace number $ws3
@@ -117,7 +94,7 @@ bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
 
-# move focused container to workspace
+# Move window to workspace
 bindsym $mod+Shift+1 move container to workspace number $ws1
 bindsym $mod+Shift+2 move container to workspace number $ws2
 bindsym $mod+Shift+3 move container to workspace number $ws3
@@ -129,14 +106,12 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
 
-# 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 'Itterasshai!' -B 'Hai!' 'i3-msg exit'"
 
-# Border
+### Design ###
+new_window 1pixel
 for_window [class="^.*"] border pixel 0
 
 # Colors from https://www.nordtheme.com/
@@ -147,35 +122,8 @@ client.unfocused        #333333 #222222 #D8DEE9 #BF616A   #222222
 client.urgent           #2f343a #BF616A #ECEFF4 #BF616A   #900000
 client.background       #ffffff
 
-# Keyboard lauyout
-exec --no-startup-id setxkbmap za
-bindsym Ctrl+Shift+1 exec --no-startup-id setxkbmap za
-
-# Background
-exec --no-startup-id compton
-exec --no-startup-id feh --bg-scale ~/wallpaper/wallpaper.png
-
-# Remove title bar
-new_window 1pixel
-
-# Screenshot
-bindsym --release $mod+Shift+p exec"import ~/screenshots/Screenshot-$(date '+%Y%m%d-%H%M%S').png"
-
-# Audio and Screen
-bindsym XF86MonBrightnessUp exec light -A 5 # increase screen brightness
-bindsym XF86MonBrightnessDown exec light -U 5 # decrease screen brightness
-
-# Workspace Cycle
-bindsym $mod+n workspace next
-bindsym $mod+p workspace prev
-
-# switch to firefox when link gets clicked
-for_window [urgent="latest" class="Firefox"] focus
-
-# PC specific configurations:
-# WORKSTATION START
 {%@@ if profile == "work" @@%}
-
+# work start
 bar {
     position bottom
     colors {
@@ -193,58 +141,32 @@ bar {
 }
 
 # Locking
-bindsym $mod+Shift+BackSpace exec "xlock -mode grav -startCmd /share/bin/isweg -endCmd /share/bin/isda -bg '#6843bf' -info ''"
-
-# Custom Workspaces
-exec --no-startup-id "firefox"
-for_window [class="Firefox"] move container to workspace 9
+bindsym $mod+Shift+BackSpace exec "~/scripts/lock-work"
 
 # Monitors
-# Primary
 set $monitor1 "HDMI-1"
-# Secondary
 set $monitor2 "HDMI-2"
-
-workspace $ws10 output $monitor2
-workspace $ws9 output $monitor2
-
-bindsym $mod+Ctrl+1 move workspace to output $monitor1
-bindsym $mod+Ctrl+2 move workspace to output $monitor2
-
+# work end
 {%@@ endif @@%}
 
-# WORKSTATION END
-
-# LAPTOP START
-
 {%@@ if profile == "laptop" @@%}
+# laptop start
+exec "~/scripts/startup-laptop"
+# i3 doesnt let me put this in the startscript
+exec_always --no-startup-id ~/.config/polybar/start.sh &
+
 # Locking
-#bindsym $mod+Shift+BackSpace exec "xlock -mode grav -info ''"
 bindsym $mod+Shift+BackSpace exec "~/scripts/lock-laptop"
 
-# Custom Workspaces
-#for_window [class="discord"] move container to workspace 8
-
 # Monitors
-# Integrated
 set $monitor1 "eDP-1"
-# potential Secondary
 set $monitor2 "HDMI-1"
 
-workspace $ws10 output $monitor2
-
-bindsym $mod+Ctrl+1 move workspace to output $monitor1
-bindsym $mod+Ctrl+2 move workspace to output $monitor2
-
-# i3-gaps
-#smart_gaps on
 gaps inner 8
 # polybar height + gaps inner
 gaps top 35
-
-exec_always --no-startup-id ~/.config/polybar/start.sh & # Fancy Bar
-exec_always --no-startup-id dunst # Notification Manager
-
+# laptop end
 {%@@ endif @@%}
 
-# LAPTOP END
+bindsym $mod+Ctrl+1 move workspace to output $monitor1
+bindsym $mod+Ctrl+2 move workspace to output $monitor2
diff --git a/dotfiles/scripts/launchpolybar b/dotfiles/scripts/launchpolybar
new file mode 100755
index 0000000..9335419
--- /dev/null
+++ b/dotfiles/scripts/launchpolybar
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sh $HOME/.config/polybar/start.sh
diff --git a/dotfiles/scripts/startup-laptop b/dotfiles/scripts/startup-laptop
new file mode 100755
index 0000000..8291d26
--- /dev/null
+++ b/dotfiles/scripts/startup-laptop
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+setxkbmap -layout za
+
+export LANG="en_US.UTF-8"
+export LANGUAGE="en_US.UTF-8"
+export SHELL="/bin/zsh"
+
+feh --bg-scale $HOME/wallpaper/wallpaper.png
+
+nm-applet &
+dunst &
+compton &