diff --git a/ubuntu/(movetousrlocalbin)-settings b/ubuntu/Desktop/(movetousrlocalbin)-settings
similarity index 100%
rename from ubuntu/(movetousrlocalbin)-settings
rename to ubuntu/Desktop/(movetousrlocalbin)-settings
diff --git a/ubuntu/.config/.compton.conf b/ubuntu/Desktop/.config/.compton.conf
similarity index 100%
rename from ubuntu/.config/.compton.conf
rename to ubuntu/Desktop/.config/.compton.conf
diff --git a/ubuntu/.config/i3/config b/ubuntu/Desktop/.config/i3/config
similarity index 100%
rename from ubuntu/.config/i3/config
rename to ubuntu/Desktop/.config/i3/config
diff --git a/ubuntu/.config/i3status/config b/ubuntu/Desktop/.config/i3status/config
similarity index 100%
rename from ubuntu/.config/i3status/config
rename to ubuntu/Desktop/.config/i3status/config
diff --git a/ubuntu/.zshrc b/ubuntu/Desktop/.zshrc
similarity index 100%
rename from ubuntu/.zshrc
rename to ubuntu/Desktop/.zshrc
diff --git a/ubuntu/Laptop/.config/.compton.conf b/ubuntu/Laptop/.config/.compton.conf
new file mode 100644
index 0000000..d2df2bb
--- /dev/null
+++ b/ubuntu/Laptop/.config/.compton.conf
@@ -0,0 +1,6 @@
+# Fading
+fading = true;                  # Fade windows during opacity changes.
+fade-delta = 12;                # The time between steps in a fade in milliseconds. (default 10).
+fade-in-step = 0.15;            # Opacity change between steps while fading in. (default 0.028).
+fade-out-step = 0.15;           # Opacity change between steps while fading out. (default 0.03).
+no-fading-openclose = false; # Fade windows in/out when opening/closing.
diff --git a/ubuntu/Laptop/.config/i3/config b/ubuntu/Laptop/.config/i3/config
new file mode 100644
index 0000000..77a8de3
--- /dev/null
+++ b/ubuntu/Laptop/.config/i3/config
@@ -0,0 +1,231 @@
+# 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:monospace 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.
+
+# 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+q kill
+
+# start dmenu (a program launcher)
+#bindsym $mod+d exec dmenu_run
+
+# use rofi instead
+
+bindsym $mod+d exec rofi -show run -lines 3 -eh 2 -width 100 -padding 800 -opacity "85" -bw 0 -bc "$bg-color" -bg "$bg-color" -fg "$text-color" -hlbg "$bg-color" -hlfg "#9575cd"
+
+# 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
+
+exec --no-startup-id nitrogen --restore
+exec_always --no-startup-id compton -f
+
+# gaps
+
+gaps outer 5
+gaps inner 10
+
+#smart_gaps on
+
+# windows style workspace switcher
+
+bindsym $mod+Control+Right workspace next
+bindsym $mod+Control+Left workspace prev
+
+workspace_auto_back_and_forth yes
+
+# Set window focusing to only focus if requester is on screen
+
+focus_on_window_activation smart
+
+# Audio Manager
+
+bindsym $mod+Shift+a exec pavucontrol
+
+# window lock
+
+bindsym Control+Mod1+l exec i3lock-fancy
+
+# Go to sleep
+
+bindsym Control+Mod1+s exec systemctl suspend
+
+# Screen Shots
+bindsym Print exec scrot '%Y-%m-%d-%s_screenshot_$wx$h.jpg' -e 'mv $f ~/Pictures/'
+bindsym Control+Print exec gnome-screenshot -i
+
+# Network Manager
+
+exec_always --no-startup-id nm-applet
+
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon 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+semicolon 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
+
+# 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
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $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 '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 semicolon 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 or $mod+r
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+r 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 #2f343f
+        statusline #2f343f
+        separator #4b5262
+
+		# colour of border, background, and text
+        focused_workspace	#2f343f	#bf616a	#d8dee8
+        active_workspace	#2f343f	#2f343f	#d8dee8
+        inactive_workspace	#2f343f	#2f343f	#d8dee8
+        urgent_workspace	#2f343f	#ebcb8b	#2f343f
+    }
+        status_command i3status
+	position top
+}
+
+new_window 1pixel
diff --git a/ubuntu/Laptop/.config/i3status/config b/ubuntu/Laptop/.config/i3status/config
new file mode 100644
index 0000000..9145983
--- /dev/null
+++ b/ubuntu/Laptop/.config/i3status/config
@@ -0,0 +1,54 @@
+general {
+        output_format = "i3bar"
+        colors = false
+        markup = pango
+        interval = 5
+        color_good = '#2f343f'
+		color_degraded = '#ebcb8b'
+		color_bad = '#ba5e57'
+}
+
+order += "load"
+order += "cpu_temperature 0"
+order += "disk /"
+order += "disk /home"
+order += "ethernet enp1s0"
+order += "wireless wlp2s0"
+order += "volume master"
+order += "battery 0"
+order += "battery 1"
+order += "tztime local"
+
+battery 0 {
+        format = "%status %percentage %remaining"
+}
+battery 1 {
+	format = "%status %percentage %remaining"
+}
+
+load {
+        format = "<span background='#f59335'> %5min Load </span>"
+}
+
+cpu_temperature 0 {
+        format = "<span background='#bf616a'> TEMP: %degrees °C </span>"
+        path = "/sys/class/thermal/thermal_zone0/temp"
+}
+
+disk "/" {
+        format = "<span background='#fec7cd'> HDD2: %free Free </span>"
+}
+
+volume master {
+        format = "<span background='#ebcb8b'> VOL: %volume </span>"
+        format_muted = "<span background='#ebcb8b'>VOL: Muted </span>"
+        device = "default"
+        mixer = "Master"
+        mixer_idx = 0
+}
+
+
+tztime local {
+		format = "<span background='#81a1c1'> %time </span>"
+		format_time = "%a %-d %b %H:%M"
+}