diff --git a/symlinks/bin/aurfetch b/symlinks/bin/aurfetch
index 9847c2c..fc7b31d 100755
--- a/symlinks/bin/aurfetch
+++ b/symlinks/bin/aurfetch
@@ -28,5 +28,3 @@ else
 	makepkg -si
 	cd $LOC
 fi
-
-
diff --git a/symlinks/bin/lockscreen b/symlinks/bin/lockscreen
new file mode 100755
index 0000000..86614a9
--- /dev/null
+++ b/symlinks/bin/lockscreen
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+WALLPAPER=~/.config/lock-wallpapers/oscar-wallpaper.jpg
+
+swaylock -f -i $WALLPAPER -s fill
diff --git a/symlinks/bin/print-last-system-upgrade b/symlinks/bin/print-last-system-upgrade
index 9f5c9ad..42f3bea 100755
--- a/symlinks/bin/print-last-system-upgrade
+++ b/symlinks/bin/print-last-system-upgrade
@@ -5,7 +5,7 @@ if [ $MACHINE_TYPE == "mac" ]; then
 else
 	if type pacman &> /dev/null
 	then
-		LAST_SYSTEM_UPGRADE=$( cat /var/log/pacman.log | grep "starting full system upgrade" | awk 'END{ print substr($1, 2) " " substr($2, 1, length($2)-1) }' )
+		LAST_SYSTEM_UPGRADE=$( cat /var/log/pacman.log | grep "starting full system upgrade" | awk 'END{ print substr($1, 2, length($1)-2) }' )
 		LAST_SYSTEM_UPGRADE_DATE=$( date -d "$LAST_SYSTEM_UPGRADE" +%s )
 	fi
 
diff --git a/symlinks/bin/set-alacritty-theme b/symlinks/bin/set-alacritty-theme
deleted file mode 100755
index 4f11248..0000000
--- a/symlinks/bin/set-alacritty-theme
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-THEME=$1
-
-CURRENT_THEME=`grep "colors:" $HOME/.config/alacritty/alacritty.yml | cut -d '*' -f2`
-echo "Current theme: $CURRENT_THEME"
-
-if [ -z $THEME ]; then
-	echo "Missing theme argument! Toggling between default dark and light (gruvbox_dark, gruvbox_light)"
-	if [ "$CURRENT_THEME" = gruvbox_dark ]; then
-		THEME=gruvbox_light
-	else
-		THEME=gruvbox_dark
-	fi
-fi
-
-sed -i "s/colors: \*\(.*\)/colors: *$THEME/" $HOME/.config/alacritty/alacritty.yml
-echo "Theme switched to: $THEME"
diff --git a/symlinks/config/Google/.gitignore b/symlinks/config/Google/.gitignore
index 30427df..9c79a5c 100644
--- a/symlinks/config/Google/.gitignore
+++ b/symlinks/config/Google/.gitignore
@@ -15,5 +15,8 @@
 **/options/vim_settings.xml
 **/options/window.state.xml
 **/options/vim_settings_local.xml
+**/options/runner.layout.xml
+**/options/designSurface.xml
+**/options/lightEdit.xml
 **/user.token
 **/port
diff --git a/symlinks/config/Google/AndroidStudioPreview4.2/codestyles/Default.xml b/symlinks/config/Google/AndroidStudioPreview4.2/codestyles/Default.xml
new file mode 100644
index 0000000..768e98a
--- /dev/null
+++ b/symlinks/config/Google/AndroidStudioPreview4.2/codestyles/Default.xml
@@ -0,0 +1,133 @@
+<code_scheme name="Default" version="173">
+  <JetCodeStyleSettings>
+    <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+      <value>
+        <package name="java.util" alias="false" withSubpackages="false" />
+        <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        <package name="io.ktor" alias="false" withSubpackages="true" />
+      </value>
+    </option>
+    <option name="PACKAGES_IMPORT_LAYOUT">
+      <value>
+        <package name="" alias="false" withSubpackages="true" />
+        <package name="java" alias="false" withSubpackages="true" />
+        <package name="javax" alias="false" withSubpackages="true" />
+        <package name="kotlin" alias="false" withSubpackages="true" />
+        <package name="" alias="true" withSubpackages="true" />
+      </value>
+    </option>
+  </JetCodeStyleSettings>
+  <codeStyleSettings language="XML">
+    <option name="FORCE_REARRANGE_MODE" value="1" />
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+    <arrangement>
+      <rules>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>xmlns:android</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>xmlns:.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:id</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*:name</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>name</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>style</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>^$</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>ANDROID_ATTRIBUTE_ORDER</order>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <NAME>.*</NAME>
+                <XML_ATTRIBUTE />
+                <XML_NAMESPACE>.*</XML_NAMESPACE>
+              </AND>
+            </match>
+            <order>BY_NAME</order>
+          </rule>
+        </section>
+      </rules>
+    </arrangement>
+  </codeStyleSettings>
+</code_scheme>
\ No newline at end of file
diff --git a/symlinks/config/Google/AndroidStudioPreview4.2/options/designSurface.xml b/symlinks/config/Google/AndroidStudioPreview4.2/options/designSurface.xml
deleted file mode 100644
index d29fdc2..0000000
--- a/symlinks/config/Google/AndroidStudioPreview4.2/options/designSurface.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<application>
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="../../../../../../layout/custom_preview.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/splash_scene_blue_fill.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/splash_scene_eyes_join.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/splash_scene_home_light_up.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/splash_scene_second_eye_appear.xml" value="0.1" />
-      </map>
-    </option>
-  </component>
-</application>
\ No newline at end of file
diff --git a/symlinks/config/Google/AndroidStudioPreview4.2/options/runner.layout.xml b/symlinks/config/Google/AndroidStudioPreview4.2/options/runner.layout.xml
deleted file mode 100644
index 1c7f13e..0000000
--- a/symlinks/config/Google/AndroidStudioPreview4.2/options/runner.layout.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<application>
-  <component name="RunnerLayoutSettings">
-    <runner id="JavaRunner">
-      <ViewImpl>
-        <option name="ID" value="ConsoleContent" />
-        <option name="placeInGrid" value="bottom" />
-      </ViewImpl>
-      <TabImpl />
-    </runner>
-  </component>
-</application>
\ No newline at end of file
diff --git a/themes/gruvbox-dark/sway_colors b/themes/gruvbox-dark/sway_colors
new file mode 100644
index 0000000..182b28e
--- /dev/null
+++ b/themes/gruvbox-dark/sway_colors
@@ -0,0 +1,5 @@
+# Set up colors of windows
+client.focused #98971a #98971a #ebdbb2 #98971a
+client.focused_inactive #282828 #282828 #a89984 #d3869b
+client.unfocused #282828 #282828 #8ec07c #586e75
+client.urgent #d33682 #d33682 #ebdbb2 #dc322f
diff --git a/themes/select-theme b/themes/select-theme
index f06aaaa..e9b4300 100755
--- a/themes/select-theme
+++ b/themes/select-theme
@@ -21,6 +21,7 @@ cp $themedir/fehbg $configdir/other-scripts/fehbg
 rm $configdir/alacritty/colors.yml.bak
 mv $configdir/alacritty/colors.yml $configdir/alacritty/colors.yml.bak
 ln -sT $themedir/alacritty_colors.yml $configdir/alacritty/colors.yml
+ln -sT $themedir/sway_colors $configdir/sway/conf.d/99_colors_override
 
 FG=black
 if [[ $theme == *"light"* ]]; then