diff --git a/.linux_items/include/live/airootfs/etc/default/ufw b/.linux_items/include/airootfs/etc/default/ufw
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/default/ufw
rename to .linux_items/include/airootfs/etc/default/ufw
diff --git a/.linux_items/include/live/airootfs/etc/hostname b/.linux_items/include/airootfs/etc/hostname
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/hostname
rename to .linux_items/include/airootfs/etc/hostname
diff --git a/.linux_items/include/live/airootfs/etc/hosts b/.linux_items/include/airootfs/etc/hosts
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/hosts
rename to .linux_items/include/airootfs/etc/hosts
diff --git a/.linux_items/include/live/airootfs/etc/locale.conf b/.linux_items/include/airootfs/etc/locale.conf
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/locale.conf
rename to .linux_items/include/airootfs/etc/locale.conf
diff --git a/.linux_items/include/live/airootfs/etc/locale.gen b/.linux_items/include/airootfs/etc/locale.gen
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/locale.gen
rename to .linux_items/include/airootfs/etc/locale.gen
diff --git a/.linux_items/include/live/airootfs/etc/motd b/.linux_items/include/airootfs/etc/motd
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/motd
rename to .linux_items/include/airootfs/etc/motd
diff --git a/.linux_items/include/live/airootfs/etc/oblogout.conf b/.linux_items/include/airootfs/etc/oblogout.conf
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/oblogout.conf
rename to .linux_items/include/airootfs/etc/oblogout.conf
diff --git a/.linux_items/include/live/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules b/.linux_items/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
rename to .linux_items/include/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules
diff --git a/.linux_items/include/live/airootfs/etc/skel/.Xresources b/.linux_items/include/airootfs/etc/skel/.Xresources
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.Xresources
rename to .linux_items/include/airootfs/etc/skel/.Xresources
diff --git a/.linux_items/include/live/airootfs/etc/skel/.aliases b/.linux_items/include/airootfs/etc/skel/.aliases
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.aliases
rename to .linux_items/include/airootfs/etc/skel/.aliases
diff --git a/.linux_items/include/live/airootfs/etc/skel/.bashrc b/.linux_items/include/airootfs/etc/skel/.bashrc
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.bashrc
rename to .linux_items/include/airootfs/etc/skel/.bashrc
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/Thunar/accels.scm b/.linux_items/include/airootfs/etc/skel/.config/Thunar/accels.scm
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/Thunar/accels.scm
rename to .linux_items/include/airootfs/etc/skel/.config/Thunar/accels.scm
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/Thunar/uca.xml b/.linux_items/include/airootfs/etc/skel/.config/Thunar/uca.xml
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/Thunar/uca.xml
rename to .linux_items/include/airootfs/etc/skel/.config/Thunar/uca.xml
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/dunst/dunstrc b/.linux_items/include/airootfs/etc/skel/.config/dunst/dunstrc
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/dunst/dunstrc
rename to .linux_items/include/airootfs/etc/skel/.config/dunst/dunstrc
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/.linux_items/include/airootfs/etc/skel/.config/gtk-3.0/settings.ini
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/gtk-3.0/settings.ini
rename to .linux_items/include/airootfs/etc/skel/.config/gtk-3.0/settings.ini
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/i3/config b/.linux_items/include/airootfs/etc/skel/.config/i3/config
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/i3/config
rename to .linux_items/include/airootfs/etc/skel/.config/i3/config
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/i3status/config b/.linux_items/include/airootfs/etc/skel/.config/i3status/config
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/i3status/config
rename to .linux_items/include/airootfs/etc/skel/.config/i3status/config
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/mimeapps.list b/.linux_items/include/airootfs/etc/skel/.config/mimeapps.list
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/mimeapps.list
rename to .linux_items/include/airootfs/etc/skel/.config/mimeapps.list
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/autostart b/.linux_items/include/airootfs/etc/skel/.config/openbox/autostart
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/openbox/autostart
rename to .linux_items/include/airootfs/etc/skel/.config/openbox/autostart
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/environment b/.linux_items/include/airootfs/etc/skel/.config/openbox/environment
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/openbox/environment
rename to .linux_items/include/airootfs/etc/skel/.config/openbox/environment
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/menu.xml b/.linux_items/include/airootfs/etc/skel/.config/openbox/menu.xml
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/openbox/menu.xml
rename to .linux_items/include/airootfs/etc/skel/.config/openbox/menu.xml
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml b/.linux_items/include/airootfs/etc/skel/.config/openbox/rc.xml
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/openbox/rc.xml
rename to .linux_items/include/airootfs/etc/skel/.config/openbox/rc.xml
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/rofi/config b/.linux_items/include/airootfs/etc/skel/.config/rofi/config
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/rofi/config
rename to .linux_items/include/airootfs/etc/skel/.config/rofi/config
diff --git a/.linux_items/include/live/airootfs/etc/skel/.config/tint2/tint2rc b/.linux_items/include/airootfs/etc/skel/.config/tint2/tint2rc
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.config/tint2/tint2rc
rename to .linux_items/include/airootfs/etc/skel/.config/tint2/tint2rc
diff --git a/.linux_items/include/live/airootfs/etc/skel/.conky_start b/.linux_items/include/airootfs/etc/skel/.conky_start
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.conky_start
rename to .linux_items/include/airootfs/etc/skel/.conky_start
diff --git a/.linux_items/include/live/airootfs/etc/skel/.conkyrc b/.linux_items/include/airootfs/etc/skel/.conkyrc
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.conkyrc
rename to .linux_items/include/airootfs/etc/skel/.conkyrc
diff --git a/.linux_items/include/live/airootfs/etc/skel/.dircolors b/.linux_items/include/airootfs/etc/skel/.dircolors
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.dircolors
rename to .linux_items/include/airootfs/etc/skel/.dircolors
diff --git a/.linux_items/include/live/airootfs/etc/skel/.gtkrc-2.0 b/.linux_items/include/airootfs/etc/skel/.gtkrc-2.0
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.gtkrc-2.0
rename to .linux_items/include/airootfs/etc/skel/.gtkrc-2.0
diff --git a/.linux_items/include/live/airootfs/etc/skel/.rsync_exclusions b/.linux_items/include/airootfs/etc/skel/.rsync_exclusions
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.rsync_exclusions
rename to .linux_items/include/airootfs/etc/skel/.rsync_exclusions
diff --git a/.linux_items/include/live/airootfs/etc/skel/.tmux.conf b/.linux_items/include/airootfs/etc/skel/.tmux.conf
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.tmux.conf
rename to .linux_items/include/airootfs/etc/skel/.tmux.conf
diff --git a/.linux_items/include/live/airootfs/etc/skel/.update_conky b/.linux_items/include/airootfs/etc/skel/.update_conky
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.update_conky
rename to .linux_items/include/airootfs/etc/skel/.update_conky
diff --git a/.linux_items/include/live/airootfs/etc/skel/.update_wallpaper b/.linux_items/include/airootfs/etc/skel/.update_wallpaper
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.update_wallpaper
rename to .linux_items/include/airootfs/etc/skel/.update_wallpaper
diff --git a/.linux_items/include/live/airootfs/etc/skel/.urxvt_default_res b/.linux_items/include/airootfs/etc/skel/.urxvt_default_res
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.urxvt_default_res
rename to .linux_items/include/airootfs/etc/skel/.urxvt_default_res
diff --git a/.linux_items/include/live/airootfs/etc/skel/.vimrc b/.linux_items/include/airootfs/etc/skel/.vimrc
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.vimrc
rename to .linux_items/include/airootfs/etc/skel/.vimrc
diff --git a/.linux_items/include/live/airootfs/etc/skel/.xinitrc b/.linux_items/include/airootfs/etc/skel/.xinitrc
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.xinitrc
rename to .linux_items/include/airootfs/etc/skel/.xinitrc
diff --git a/.linux_items/include/live/airootfs/etc/skel/.zlogin b/.linux_items/include/airootfs/etc/skel/.zlogin
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.zlogin
rename to .linux_items/include/airootfs/etc/skel/.zlogin
diff --git a/.linux_items/include/live/airootfs/etc/skel/.zshrc b/.linux_items/include/airootfs/etc/skel/.zshrc
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/skel/.zshrc
rename to .linux_items/include/airootfs/etc/skel/.zshrc
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
rename to .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service b/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
rename to .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/rngd.service
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
rename to .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service b/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
rename to .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
diff --git a/.linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service b/.linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
rename to .linux_items/include/airootfs/etc/systemd/system/multi-user.target.wants/ufw.service
diff --git a/.linux_items/include/live/airootfs/etc/udev/rules.d/99-udisks2.rules b/.linux_items/include/airootfs/etc/udev/rules.d/99-udisks2.rules
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/udev/rules.d/99-udisks2.rules
rename to .linux_items/include/airootfs/etc/udev/rules.d/99-udisks2.rules
diff --git a/.linux_items/include/live/airootfs/etc/udevil/udevil.conf b/.linux_items/include/airootfs/etc/udevil/udevil.conf
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/udevil/udevil.conf
rename to .linux_items/include/airootfs/etc/udevil/udevil.conf
diff --git a/.linux_items/include/live/airootfs/etc/ufw/ufw.conf b/.linux_items/include/airootfs/etc/ufw/ufw.conf
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/ufw/ufw.conf
rename to .linux_items/include/airootfs/etc/ufw/ufw.conf
diff --git a/.linux_items/include/live/airootfs/etc/ufw/user.rules b/.linux_items/include/airootfs/etc/ufw/user.rules
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/ufw/user.rules
rename to .linux_items/include/airootfs/etc/ufw/user.rules
diff --git a/.linux_items/include/live/airootfs/etc/ufw/user6.rules b/.linux_items/include/airootfs/etc/ufw/user6.rules
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/ufw/user6.rules
rename to .linux_items/include/airootfs/etc/ufw/user6.rules
diff --git a/.linux_items/include/live/airootfs/etc/vconsole.conf b/.linux_items/include/airootfs/etc/vconsole.conf
similarity index 100%
rename from .linux_items/include/live/airootfs/etc/vconsole.conf
rename to .linux_items/include/airootfs/etc/vconsole.conf
diff --git a/.linux_items/include/live/airootfs/usr/share/applications/Hardware Diagnostics.desktop b/.linux_items/include/airootfs/usr/share/applications/Hardware Diagnostics.desktop
similarity index 100%
rename from .linux_items/include/live/airootfs/usr/share/applications/Hardware Diagnostics.desktop
rename to .linux_items/include/airootfs/usr/share/applications/Hardware Diagnostics.desktop
diff --git a/.linux_items/include/live/airootfs/usr/share/applications/Hardware Information.desktop b/.linux_items/include/airootfs/usr/share/applications/Hardware Information.desktop
similarity index 100%
rename from .linux_items/include/live/airootfs/usr/share/applications/Hardware Information.desktop
rename to .linux_items/include/airootfs/usr/share/applications/Hardware Information.desktop
diff --git a/.linux_items/include/live/airootfs/usr/share/applications/NetworkTest.desktop b/.linux_items/include/airootfs/usr/share/applications/NetworkTest.desktop
similarity index 100%
rename from .linux_items/include/live/airootfs/usr/share/applications/NetworkTest.desktop
rename to .linux_items/include/airootfs/usr/share/applications/NetworkTest.desktop
diff --git a/.linux_items/include/iso/arch/arch.conf b/.linux_items/include/iso/arch/arch.conf
deleted file mode 100644
index 06d8c761..00000000
--- a/.linux_items/include/iso/arch/arch.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-## WK-Arch Settings ##
-
-# Backup options
-declare -a BACKUP_1=(
-    "ServerOne"                  # Server name
-    "10.0.0.10"                # IP
-    "Backups"                   # Share name
-    "backup"                    # User name
-    "Abracadabra"               # Password
-)
-declare -a BACKUP_2=(
-    "ServerTwo"                    # Server name
-    "10.0.0.11"                # IP
-    "Backups"                   # Share name
-    "backup"                    # User name
-    "Abracadabra"               # Password
-)
-declare -a BACKUP_3=(
-    ""                          # Server name
-    ""                          # IP
-    ""                          # Share name
-    ""                          # User name
-    ""                          # Password
-)
-declare -a BACKUP_4=(
-    ""                          # Server name
-    ""                          # IP
-    ""                          # Share name
-    ""                          # User name
-    ""                          # Password
-)
-
-# Hardware testing options
-TEST_CPU_LENGTH="7"             # Time in minutes to run Prime95
-
-# Network options
-WIFI_SSID="SomeWiFi"           # Use the 2.4Ghz network for better compatability
-WIFI_PASS="Abracadabra"          
-
-# Results upload options
-SKIP_UPLOAD="False"             # Set to "True" to disable all uploads
-DIAG_SERVER="10.0.0.10"        # Use the IP and not the server name
-DIAG_SHARE="/srv/ClientInfo"    # Full path to shared folder (relative to the server's root)
-DIAG_USER="wkdiag"              # User used to connect to the server via SSH
diff --git a/.linux_items/include/iso/arch/conky.rc b/.linux_items/include/iso/arch/conky.rc
deleted file mode 100644
index bd492c9b..00000000
--- a/.linux_items/include/iso/arch/conky.rc
+++ /dev/null
@@ -1,165 +0,0 @@
-# For commands above TEXT check:
-# http://conky.sourceforge.net/config_settings.html
-#
-# For commands available below TEXT check:
-# http://conky.sourceforge.net/variables.html
-
-# Bunsen Labs Conky help threads
-# http://crunchbang.org/forums/viewtopic.php?pid=371424#p371424
-
-# beta tested by: smacz
-# Enjoy! :)
-
-# pkill -xf "conky -q -c $HOME/.config/conky/BL-Default.conkyrc" &
-###  Begin Window Settings  #####################
-own_window yes
-own_window_type normal
-own_window_transparent no
-own_window_hints undecorated,below,skip_taskbar,skip_pager,sticky
-own_window_colour 000000
-own_window_class Conky
-#own_window_title Bunsen Labs Default Conky
-own_window_title Default Conky
-
-### ARGB can be used for real transparency
-### NOTE that a composite manager is required for real transparency.
-### This option will not work as desired (in most cases) in conjunction with
-### own_window_type normal
-own_window_argb_visual yes # Options: yes or no
-
-### When ARGB visuals are enabled, this use this to modify the alpha value
-### Use: own_window_type normal
-### Use: own_window_transparent no
-### Valid range is 0-255, where 0 is 0% opacity, and 255 is 100% opacity.
-own_window_argb_value 160
-
-minimum_size 180 0  ### width | height
-maximum_width 180
-
-gap_x 20    ### left | right
-gap_y 45    ### up | down
-
-alignment tr
-#######################  End Window Settings  ###
-###  Font Settings  #############################
-# Use Xft (anti-aliased font and stuff)
-use_xft yes
-xftfont Inconsolata:bold:size=9
-#xftfont Liberation Sans:size=9
-
-# Alpha of Xft font. Must be a value at or between 1 and 0 ###
-xftalpha 1
-# Force UTF8? requires XFT ###
-override_utf8_locale yes
-
-uppercase no
-#########################  End Font Settings  ###
-###  Colour Settings  ###########################
-draw_shades no #yes
-default_shade_color 000000
-
-draw_outline no # amplifies text if yes
-default_outline_color 000000
-
-#default_color 656667 # Waldorf original colour
-#default_color 7a7a7a # Flame  & Bunsen Grey
-#default_color 929292 # Labs Grey
-default_color C0C0C0 # Silver
-color0 B0E0E6 # PowderBlue
-color1 778899 # LightSlateGray
-color2 D8BFD8 # Thistle
-color3 9ACD32 # YellowGreen
-color4 FFA07A # LightSalmon
-color5 FFDEAD # NavajoWhite
-color6 00BFFF # DeepSkyBlue
-color7 5F9EA0 # CadetBlue
-color8 BDB76B # DarkKhaki
-color9 CD5C5C # IndianRed
-#######################  End Colour Settings  ###
-###  Borders Section  ###########################
-draw_borders no
-# Stippled borders?
-stippled_borders 5
-# border margins
-border_inner_margin 5
-border_outer_margin 0
-# border width
-border_width 2
-# graph borders
-draw_graph_borders yes #no
-#default_graph_size 15 40
-#######################  End Borders Section  ###
-###  Miscellaneous Section  #####################
-# Boolean value, if true, Conky will be forked to background when started.
-background yes
-
-# Adds spaces around certain objects to stop them from moving other things
-# around, this only helps if you are using a mono font
-# Options: right, left or none
-use_spacer none
-
-# Default and Minimum size is 256 - needs more for single commands that
-# "call" a lot of text IE: bash scripts
-text_buffer_size 6144
-
-# Subtract (file system) buffers from used memory?
-no_buffers yes
-
-# change GiB to G and MiB to M
-short_units yes
-
-# Like it says, ot pads the decimals on % values
-# doesn't seem to work since v1.7.1
-pad_percents 2
-
-# Imlib2 image cache size, in bytes. Default 4MiB Increase this value if you use
-# $image lots. Set to 0 to disable the image cache.
-imlib_cache_size 0
-
-# Use the Xdbe extension? (eliminates flicker)
-# It is highly recommended to use own window with this one
-# so double buffer won't be so big.
-double_buffer yes
-
-#   Maximum size of user text buffer, i.e. layout below TEXT line in config file
-#  (default is 16384 bytes)
-# max_user_text 16384
-
-# Desired output unit of all objects displaying a temperature. Parameters are
-# either "fahrenheit" or "celsius". The default unit is degree Celsius.
-# temperature_unit Fahrenheit
-
-#################  End Miscellaneous Section  ###
-#### ${font Monospace:bold:size=10}${alignc}${execpi 600 $HOME/.config/conky/scripts/bunsenweather.sh}
-update_interval 1
-
-TEXT
-${color}${alignc}S Y S T E M    I N F O
-${hr}
-Date:${alignr}${time %F}
-Time:${alignr}${time %H:%M}
-Uptime:${alignr}${uptime_short}
-
-CPU: ${if_match ${cpu cpu0}<10}  ${cpu cpu0}\
-${else}${if_match ${cpu cpu0}<100} ${cpu cpu0}\
-${else}${cpu cpu0}${endif}${endif}% Used${alignr}${freq_g} GHz
-${cpugraph cpu0 20,180 ${color} ${color}}
-RAM: ${mem} Used${alignr}${memmax}
-${memgraph 20,180 ${color} ${color}}
-Disk I/O:
-${diskiograph 20,180 ${color} ${color}}
-Down:  ${downspeed}${goto 115}Up:${alignr}${upspeed}
-
-${alignc}S H O R T C U T    K E Y S
-${hr}
-[Super] + d${alignr}HW Diagnostics
-[Super] + f${alignr}File Manager
-[Super] + h${alignr}Task Manager
-[Super] + i${alignr}HW Information
-[Super] + m${alignr}Mount Volumes
-[Super] + r${alignr}Run Dialog
-[Super] + s${alignr}SMART Check
-[Super] + t${alignr}Terminal
-[Super] + v${alignr}View Temps
-[Super] + w${alignr}Web Browser
-[Super] + x${alignr}Logout
diff --git a/.linux_items/include/iso/arch/wifi.conf b/.linux_items/include/iso/arch/wifi.conf
deleted file mode 100644
index 0b0d5850..00000000
--- a/.linux_items/include/iso/arch/wifi.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-ctrl_interface=/var/run/wpa_supplicant
-eapol_version=1
-ap_scan=1
-fast_reauth=1
-network={
-    ssid="SomeWiFi"
-    psk="Abracadabra"
-    priority=5
-}
diff --git a/Build Linux b/Build Linux
index ff0b0d59..7c84ad7a 100755
--- a/Build Linux	
+++ b/Build Linux	
@@ -95,7 +95,7 @@ function copy_live_env() {
     rsync -aI /usr/share/archiso/configs/releng/ "$LIVE_DIR/"
     
     # Add items
-    rsync -aI "$ROOT_DIR/.linux_items/include/live/" "$LIVE_DIR/"
+    rsync -aI "$ROOT_DIR/.linux_items/include/" "$LIVE_DIR/"
     mkdir -p "$LIVE_DIR/airootfs/usr/local/bin"
     rsync -aI "$ROOT_DIR/.bin/Scripts/" "$LIVE_DIR/airootfs/usr/local/bin/"
 
@@ -124,11 +124,6 @@ function run_elevated() {
 function update_live_env() {
     hostname="$(echo "${KIT_NAME_SHORT}-linux" | tr "[:upper:]" "[:lower:]")"
     username="$(echo "${KIT_NAME_SHORT}tech" | tr "[:upper:]" "[:lower:]")"
-    
-    # build.sh
-    if ! grep -iq 'customize_iso' "$LIVE_DIR/build.sh"; then
-        sed -ir "s!run_once make_iso\$!# customize_iso\ncp -a \"$ROOT_DIR/.linux_items/include/iso\"/* \"\${work_dir}/iso\"/\n\nrun_once make_iso!" "$LIVE_DIR/build.sh"
-    fi
 
     # Hostname
     echo "$hostname" > "$LIVE_DIR/airootfs/etc/hostname"