diff --git a/git/.gitconfig b/git/.gitconfig
index fe25a53..bb7ef42 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -4,7 +4,7 @@
 
 [core]
     editor = vim
-	excludesfile = ~/.gitignore_global
+	excludesfile = /home/alrayyes/.gitignore_global
 
 [push]
     default = matching
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
deleted file mode 100644
index b0ead6d..0000000
--- a/i3/.config/i3/config
+++ /dev/null
@@ -1,280 +0,0 @@
-# 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 http://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
-font pango:System San Francisco Display 8
-
-# Colours
-set $base00 #101218
-set $base01 #1f222d
-set $base02 #252936
-set $base03 #7780a1
-set $base04 #C0C5CE
-set $base05 #d1d4e0
-set $base06 #C9CCDB
-set $base07 #ffffff
-set $base08 #ee829f
-set $base09 #f99170
-set $base0A #ffefcc
-set $base0B #a5ffe1
-set $base0C #97e0ff
-set $base0D #97bbf7
-set $base0E #c0b7f9
-set $base0F #fcc09e
-
-# 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
-# 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
-bindsym $mod+d exec rofi -show run -lines 3 -eh 2 -width 100 -opacity "85" -bw 0 -hlfg "#9575cd" -font "System San Francisco Display 18" -bc "#2f343f" -bg "#2f343f" -hlbg "#2f343f" -fg "#f3f4f5" -padding 500 -fullscreen
-
-# 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
-
-# Name the workspaces
-set $workspace1 "1: term "
-set $workspace2 "2: www "
-set $workspace3 "3: code "
-set $workspace4 "4: music "
-set $workspace5 "5: news "
-set $workspace6 "6: email "
-set $workspace7 "7: im "
-
-# switch to workspace
-bindsym $mod+1 workspace $workspace1
-bindsym $mod+2 workspace $workspace2
-bindsym $mod+3 workspace $workspace3
-bindsym $mod+4 workspace $workspace4
-bindsym $mod+5 workspace $workspace5
-bindsym $mod+6 workspace $workspace6
-bindsym $mod+7 workspace $workspace7
-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 $workspace1
-bindsym $mod+Shift+2 move container to workspace $workspace2
-bindsym $mod+Shift+3 move container to workspace $workspace3
-bindsym $mod+Shift+4 move container to workspace $workspace4
-bindsym $mod+Shift+5 move container to workspace $workspace5
-bindsym $mod+Shift+6 move container to workspace $workspace6
-bindsym $mod+Shift+7 move container to workspace $workspace7
-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
-
-workspace $workspace1 output DP1 
-workspace $workspace2 output DP1
-workspace $workspace3 output DP1
-workspace $workspace4 output DP1
-workspace $workspace5 output DP1
-workspace $workspace6 output DP1
-workspace $workspace7 output HDMI1
-
-assign [class="Google-chrome" instance="reddit.com"] $workspace5
-assign [class="Google-chrome" instance="tweetdeck.twitter.com"] $workspace5
-assign [class="Google-chrome"] $workspace2
-assign [class="firejail firefox"] $workspace2
-assign [class="Clementine"] $workspace4
-assign [class="Terminator" instance="cmus"] $workspace4
-assign [class="Gpodder"] $workspace4
-assign [class="Terminator" instance="mutt"] $workspace6
-assign [class="Hexchat"] $workspace7
-assign [class="Slack"] $workspace7
-assign [class="MPlayer" instance="aljazeera"] $workspace7
-
-# 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
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-} bindsym $mod+r mode "resize"
-
-# arandr
-for_window [title="Screen Layout Editor"] floating enable
-
-# Thunderbird write new message, floating
-for_window [title="Write:"] floating enable
-
-# Toggl
-#for_window [title="Toggl Desktop"] floating enable
-
-# Widow Colours
-#                         border  background text    indicator
-client.focused          $base01 $base01    $base07 $base0F
-client.focused_inactive $base02 $base02    $base03 $base0F
-client.unfocused        $base02 $base02    $base03 $base0F
-client.urgent           $base02 $base08    $base00 $base0F
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-	colors {
-      separator $base03
-      background $base01
-      statusline $base05
-#                        border  background text
-      focused_workspace  $base01 $base01    $base07
-      active_workspace   $base01 $base02    $base03
-      inactive_workspace $base01 $base01    $base03
-      urgent_workspace   $base01 $base01    $base08
-    }
-
-	#i3bar position
-	position top
-
-	# Use custom i3status.conf
-	#status_command i3status -c ~/.config/i3/i3status.conf
-	status_command i3blocks -c ~/.config/i3/i3blocks.conf
-	
-	#font pango:DejaVu Sans Mono, Awesome 10
-
-	# Show tray icons on primary display      
-	tray_output primary
-	tray_output eDP1
-}
-
-# Startup programs
-exec_always --no-startup-id xrandr --dpi 180 --output eDP1
-exec_always --no-startup-id xrandr --output DP1 --primary
-exec_always --no-startup-id xrandr --output HDMI1 --mode 1920x1200 --right-of DP1 --rotate left 
-exec_always --no-startup-id nitrogen --restore; sleep 1; compton -b
-exec_always --no-startup-id ~/bin/start-conky.sh
-
-exec --no-startup-id nm-applet
-exec --no-startup-id firejail dropbox start
-exec --no-startup-id compton -f
-exec --no-startup-id redshift-gtk
-exec --no-startup-id xautolock -time 10 -locker "i3lock-fancy"
-exec --no-startup-id /usr/lib/deja-dup/deja-dup/deja-dup-monitor
-
-#exec firejail google-chrome-stable --new-window --app=https://tweetdeck.twitter.com/
-#exec firejail google-chrome-stable --new-window --app=https://www.reddit.com/
-exec firejail google-chrome-stable
-#exec firejail firefox
-exec firejail hexchat
-exec firejail slack
-exec ~/.config/i3/aljazeera.sh
-exec terminator --classname=cmus -e firejail cmus
-exec terminator --classname=mutt -e firejail mutt
-exec firejail gpodder
-
-# Custom KeyBinds
-bindsym Control+$mod+l exec i3lock-fancy
-bindsym --release $mod+z exec scrot '%Y-%m-%d-%T_$wx$h_scrot.png' -s -e 'mv $f ~/Dropbox/Screenshots/'
-bindsym --release Shift+$mod+z exec scrot '%Y-%m-%d-%T_$wx$h_scrot.png' -e 'mv $f ~/Dropbox/Screenshots/'
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
-
-# Sreen brightness controls
-bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
-bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
new file mode 120000
index 0000000..0c44390
--- /dev/null
+++ b/i3/.config/i3/config
@@ -0,0 +1 @@
+config.desktop
\ No newline at end of file
diff --git a/i3/.config/i3/config.desktop b/i3/.config/i3/config.desktop
new file mode 100644
index 0000000..2eceb70
--- /dev/null
+++ b/i3/.config/i3/config.desktop
@@ -0,0 +1,279 @@
+# 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 http://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
+font pango:System San Francisco Display 8
+
+# Colours
+set $base00 #101218
+set $base01 #1f222d
+set $base02 #252936
+set $base03 #7780a1
+set $base04 #C0C5CE
+set $base05 #d1d4e0
+set $base06 #C9CCDB
+set $base07 #ffffff
+set $base08 #ee829f
+set $base09 #f99170
+set $base0A #ffefcc
+set $base0B #a5ffe1
+set $base0C #97e0ff
+set $base0D #97bbf7
+set $base0E #c0b7f9
+set $base0F #fcc09e
+
+# 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
+# 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
+bindsym $mod+d exec rofi -show run -lines 3 -eh 2 -width 100 -opacity "85" -bw 0 -hlfg "#9575cd" -font "System San Francisco Display 18" -bc "#2f343f" -bg "#2f343f" -hlbg "#2f343f" -fg "#f3f4f5" -padding 500 -fullscreen
+
+# 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
+
+# Name the workspaces
+set $workspace1 "1: term "
+set $workspace2 "2: www "
+set $workspace3 "3: code "
+set $workspace4 "4: music "
+set $workspace5 "5: news "
+set $workspace6 "6: email "
+set $workspace7 "7: im "
+
+# switch to workspace
+bindsym $mod+1 workspace $workspace1
+bindsym $mod+2 workspace $workspace2
+bindsym $mod+3 workspace $workspace3
+bindsym $mod+4 workspace $workspace4
+bindsym $mod+5 workspace $workspace5
+bindsym $mod+6 workspace $workspace6
+bindsym $mod+7 workspace $workspace7
+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 $workspace1
+bindsym $mod+Shift+2 move container to workspace $workspace2
+bindsym $mod+Shift+3 move container to workspace $workspace3
+bindsym $mod+Shift+4 move container to workspace $workspace4
+bindsym $mod+Shift+5 move container to workspace $workspace5
+bindsym $mod+Shift+6 move container to workspace $workspace6
+bindsym $mod+Shift+7 move container to workspace $workspace7
+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
+
+workspace $workspace1 output DP1 
+workspace $workspace2 output DP1
+workspace $workspace3 output DP1
+workspace $workspace4 output DP1
+workspace $workspace5 output DP1
+workspace $workspace6 output DP1
+workspace $workspace7 output HDMI1
+
+assign [class="Google-chrome" instance="reddit.com"] $workspace5
+assign [class="Google-chrome" instance="tweetdeck.twitter.com"] $workspace5
+assign [class="Google-chrome"] $workspace2
+assign [class="firejail firefox"] $workspace2
+assign [class="Clementine"] $workspace4
+assign [class="Terminator" instance="cmus"] $workspace4
+assign [class="Gpodder"] $workspace4
+assign [class="Terminator" instance="mutt"] $workspace6
+assign [class="Hexchat"] $workspace7
+assign [class="Slack"] $workspace7
+assign [class="MPlayer" instance="aljazeera"] $workspace7
+
+# 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
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+} bindsym $mod+r mode "resize"
+
+# arandr
+for_window [title="Screen Layout Editor"] floating enable
+
+# Thunderbird write new message, floating
+for_window [title="Write:"] floating enable
+
+# Toggl
+#for_window [title="Toggl Desktop"] floating enable
+
+# Widow Colours
+#                         border  background text    indicator
+client.focused          $base01 $base01    $base07 $base0F
+client.focused_inactive $base02 $base02    $base03 $base0F
+client.unfocused        $base02 $base02    $base03 $base0F
+client.urgent           $base02 $base08    $base00 $base0F
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+	colors {
+      separator $base03
+      background $base01
+      statusline $base05
+#                        border  background text
+      focused_workspace  $base01 $base01    $base07
+      active_workspace   $base01 $base02    $base03
+      inactive_workspace $base01 $base01    $base03
+      urgent_workspace   $base01 $base01    $base08
+    }
+
+	#i3bar position
+	position top
+
+	# Use custom i3status.conf
+	#status_command i3status -c ~/.config/i3/i3status.conf
+	status_command i3blocks -c ~/.config/i3/i3blocks.conf
+	
+	#font pango:DejaVu Sans Mono, Awesome 10
+
+	# Show tray icons on primary display      
+	tray_output primary
+	tray_output eDP1
+}
+
+# Startup programs
+exec_always --no-startup-id xrandr --output DP1 --primary
+exec_always --no-startup-id xrandr --output HDMI1 --mode 1920x1200 --right-of DP1 --rotate left 
+exec_always --no-startup-id nitrogen --restore; sleep 1; compton -b
+exec_always --no-startup-id ~/bin/start-conky.sh
+
+exec --no-startup-id nm-applet
+exec --no-startup-id firejail dropbox start
+exec --no-startup-id compton -f
+exec --no-startup-id redshift-gtk
+exec --no-startup-id xautolock -time 10 -locker "i3lock-fancy"
+exec --no-startup-id /usr/lib/deja-dup/deja-dup/deja-dup-monitor
+
+exec firejail google-chrome-stable --new-window --app=https://tweetdeck.twitter.com/
+exec firejail google-chrome-stable --new-window --app=https://www.reddit.com/
+exec firejail google-chrome-stable
+#exec firejail firefox
+exec firejail hexchat
+exec firejail slack
+exec ~/.config/i3/aljazeera.sh
+exec terminator --classname=cmus -e firejail cmus
+exec terminator --classname=mutt -e firejail mutt
+exec firejail gpodder
+
+# Custom KeyBinds
+bindsym Control+$mod+l exec i3lock-fancy
+bindsym --release $mod+z exec scrot '%Y-%m-%d-%T_$wx$h_scrot.png' -s -e 'mv $f ~/Dropbox/Screenshots/'
+bindsym --release Shift+$mod+z exec scrot '%Y-%m-%d-%T_$wx$h_scrot.png' -e 'mv $f ~/Dropbox/Screenshots/'
+
+# Pulse Audio controls
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+
+# Sreen brightness controls
+bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
+bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness