diff --git a/bash/.alias.sh b/bash/.alias.sh
index 10b258e..a3185a3 100644
--- a/bash/.alias.sh
+++ b/bash/.alias.sh
@@ -33,6 +33,9 @@ alias nmapscan='nmap -n -sP'
 # show file content without comment lines
 alias nocomment='grep -Ev '\''^(#|$)'\'''
 
+# list files/dirs on separate lines
+alias list='find ./ -maxdepth 1 -printf "%f\n"'
+
 #show directories
 alias dirs='ls -FlA | grep :*/' 
 
diff --git a/dependencies/aur.txt b/dependencies/aur.txt
index c382a89..6668ca1 100644
--- a/dependencies/aur.txt
+++ b/dependencies/aur.txt
@@ -1,2 +1,4 @@
 notify-osd-customizable
-notifyconf
\ No newline at end of file
+notifyconf
+enpass-bin
+insync
\ No newline at end of file
diff --git a/dependencies/pacman.txt b/dependencies/pacman.txt
index 317f087..db4c0cb 100644
--- a/dependencies/pacman.txt
+++ b/dependencies/pacman.txt
@@ -1,3 +1,4 @@
+rsync
 i3lock
 feh
 arandr
diff --git a/i3/config b/i3/config
index 1aeb77b..9b360cc 100644
--- a/i3/config
+++ b/i3/config
@@ -82,6 +82,7 @@ bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+Escape exec "i3-nagbar -t warning -m 'Do you really want to exit i3?' -b 'Yes, exit i3' 'i3-msg exit'"
 bindsym $mod+Shift+Delete exec "i3-nagbar -t alert -m 'Do you really want to shut down?' -b 'Yes, Shutdown' 'shutdown -h now'"
+bindsym $mod+Shift+BackSpace exec "i3-nagbar -t error -m 'Do you really want to reboot?' -b 'Yes, Reboot' 'reboot'"
 
 # focus on the parent window
 bindsym $mod+shift+p focus parent
@@ -218,6 +219,66 @@ assign [class="MongoDB Compass"] $workspace8
 assign [class="robo3t"] $workspace8
 assign [class="Mysql-workbench-bin"] $workspace8
 
+############################################
+#    i3-gaps                               #
+############################################
+# Disable window titlebars entirely
+for_window [class="^.*"] border pixel 2
+
+# Set inner/outer gaps
+gaps inner 10
+# gaps outer 0
+
+bindsym $mod+Shift+plus gaps inner all plus 5
+bindsym $mod+Shift+minus gaps inner all minus 5
+bindsym $mod+Shift+Home gaps inner all set 10
+
+# Smart borders (draw borders around container only if it is not the only container on this workspace) 
+smart_borders on
+
+# Smart gaps (gaps used if only more than one container on the workspace)
+smart_gaps on
+
+# Press $mod+Shift+g to enter the gap mode. Choose o or i for modifying outer/inner gaps. 
+# Press one of + / - (in-/decrement for current workspace) or 0 (remove gaps for current workspace). 
+# If you also press Shift with these keys, the change will be global for all workspaces.
+set $mode_gaps Gaps: (o) outer, (i) inner
+set $mode_gaps_outer Outer Gaps: +|-|0 (local), Shift + +|-|0 (global)
+set $mode_gaps_inner Inner Gaps: +|-|0 (local), Shift + +|-|0 (global)
+bindsym $mod+Shift+g mode "$mode_gaps"
+
+mode "$mode_gaps" {
+        bindsym o      mode "$mode_gaps_outer"
+        bindsym i      mode "$mode_gaps_inner"
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+mode "$mode_gaps_inner" {
+        bindsym plus  gaps inner current plus 5
+        bindsym minus gaps inner current minus 5
+        bindsym 0     gaps inner current set 0
+
+        bindsym Shift+plus  gaps inner all plus 5
+        bindsym Shift+minus gaps inner all minus 5
+        bindsym Shift+0     gaps inner all set 0
+
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+mode "$mode_gaps_outer" {
+        bindsym plus  gaps outer current plus 5
+        bindsym minus gaps outer current minus 5
+        bindsym 0     gaps outer current set 0
+
+        bindsym Shift+plus  gaps outer all plus 5
+        bindsym Shift+minus gaps outer all minus 5
+        bindsym Shift+0     gaps outer all set 0
+
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
 ############################################
 #    Autorun                               #
 ############################################
diff --git a/install.sh b/install.sh
index a01819f..8013b0b 100644
--- a/install.sh
+++ b/install.sh
@@ -17,23 +17,31 @@ function yes_or_no {
 
 # moves all fonts into the fonts directory (overwriting existing files)
 function install_fonts {
-	mkdir ~/.fonts
+	mkdir -p ~/.fonts
 	yes | cp -rf ./fonts/*.ttf ~/.fonts
 }
 
 # install basic rice files
 function install_rice {
-	mkdir ~/.config/i3
-	mkdir ~/Pictures/Wallpapers
-	yes | cp -rf i3/* ~/.config/i3
+	mkdir -p ~/.config/i3
+	mkdir -p ~/Pictures/Wallpapers
 	cp wallpapers/wallpaper.jpeg ~/Pictures/Wallpapers/wallpaper.jpg
+	yes | cp -rf i3/* ~/.config/i3
 }
 
 # install other configs
 function install_config {
 	rm ~/.notify-osd 
-	mv notify-osd/notify-osd ~/.notify-osd
-	rsync -av ./config ~/.config
+	cp -f notify-osd/notify-osd ~/.notify-osd
+	cp -f ./bash/.alias.sh ~/.alias
+	cp -f ./bash/.bashrc ~/
+	cp -f ./nano/.nanorc ~/
+	cp -rf ./config ~/.config
+}
+
+# Installs the file templates in the ~/Templates directory.
+function install_file_templates {
+	cp -rf ./templates/* ~/Templates
 }
 
 # Installs the dependencies on Arch Linux
@@ -79,5 +87,8 @@ yes_or_no "Do you want to install the config files?" && install_config
 # Ask for font installation
 yes_or_no "Do you want to install the fonts?" && install_fonts
 
+# Ask for template file installation
+yes_or_no "Do you want to install the file templates? (~/Templates)" && install_file_templates
+
 # Ask the user whether it wants to continue
-yes_or_no "Are you sure you want to install my rice?" && install_rice
+yes_or_no "Are you sure you want to install my i3 rice?" && install_rice
diff --git a/nano/.nanorc b/nano/.nanorc
new file mode 100644
index 0000000..db337b2
--- /dev/null
+++ b/nano/.nanorc
@@ -0,0 +1,44 @@
+include /usr/share/nano/objc.nanorc
+include /usr/share/nano/elisp.nanorc
+include /usr/share/nano/nanorc.nanorc
+include /usr/share/nano/mutt.nanorc
+include /usr/share/nano/nftables.nanorc
+include /usr/share/nano/html.nanorc
+include /usr/share/nano/php.nanorc
+include /usr/share/nano/tex.nanorc
+include /usr/share/nano/java.nanorc
+include /usr/share/nano/go.nanorc
+include /usr/share/nano/fortran.nanorc
+include /usr/share/nano/tcl.nanorc
+include /usr/share/nano/texinfo.nanorc
+include /usr/share/nano/cmake.nanorc
+include /usr/share/nano/man.nanorc
+include /usr/share/nano/css.nanorc
+include /usr/share/nano/javascript.nanorc
+include /usr/share/nano/rust.nanorc
+include /usr/share/nano/autoconf.nanorc
+include /usr/share/nano/makefile.nanorc
+include /usr/share/nano/mgp.nanorc
+include /usr/share/nano/default.nanorc
+include /usr/share/nano/changelog.nanorc
+include /usr/share/nano/asm.nanorc
+include /usr/share/nano/c.nanorc
+include /usr/share/nano/lua.nanorc
+include /usr/share/nano/xml.nanorc
+include /usr/share/nano/groff.nanorc
+include /usr/share/nano/ruby.nanorc
+include /usr/share/nano/po.nanorc
+include /usr/share/nano/ocaml.nanorc
+include /usr/share/nano/json.nanorc
+include /usr/share/nano/patch.nanorc
+include /usr/share/nano/sh.nanorc
+include /usr/share/nano/pov.nanorc
+include /usr/share/nano/python.nanorc
+include /usr/share/nano/gentoo.nanorc
+include /usr/share/nano/guile.nanorc
+include /usr/share/nano/nanohelp.nanorc
+include /usr/share/nano/perl.nanorc
+include /usr/share/nano/spec.nanorc
+include /usr/share/nano/postgresql.nanorc
+include /usr/share/nano/debian.nanorc
+include /usr/share/nano/awk.nanorc