diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38156aa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+keys
\ No newline at end of file
diff --git a/README.md b/README.md
index 75caea7..be074f7 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,30 @@
 # Remote-Linux-Unlocker
-Remote Linux Unlocker is an android application paired with a linux daemon that allows users to unlock and lock the Ubuntu Unity lock screen.
 
-### How to install the android application
-Install the android application from the [Google Play Store](https://play.google.com/store/apps/details?id=com.maxchehab.remotelinuxunlocker) or download the source from this repository.
+Remote Linux Unlocker is an android application paired with a linux daemon that allows users to unlock and lock the Ubuntu Unity lock screen.
 
-### How to install the linux daemon
+## How to install the android application
 
-```sh
-$ wget https://github.com/maxchehab/remote-linux-unlocker/raw/master/linux-daemon/linux-daemon.zip
+Install the android application from the zip file (download command below) or download the source from this repository.
 
-$ unzip linux-daemon.zip
+> [!NOTE]
+> Until this PR is merged, replace the wget command below with
+> ```diff
+> - wget https://github.com/maxchehab/remote-linux-unlocker/raw/master/linux-daemon/linux-daemon.zip
+> + wget https://github.com/DitherDude/remote-linux-unlocker/raw/master/linux-daemon/linux-daemon.zip
+> ```
 
-$ cd linux-daemon
+## How to install the linux daemon
 
+```console
+user@machine:~/Downloads$ wget https://github.com/maxchehab/remote-linux-unlocker/raw/master/linux-daemon/linux-daemon.zip
+user@machine:~/Downloads$ unzip linux-daemon.zip
+user@machine:~/Downloads$ cd linux-daemon
 #edit `unlocker-daemon.service` so that the absolute path to unlocker-daemon.py is correct
+#run the below commands as sudo!
+root@machine:.../linux-daemon# cp unlocker-daemon.service /etc/systemd/system/unlocker-daemon.service
+root@machine:~# systemctl daemon-reload
+root@machine:~# systemctl enable unlocker-daemon
+root@machine:~# systemctl start unlocker-daemon
 
-$ mv unlocker-daemon.service /etc/systemd/system/unlocker-daemon
-
-$ sudo systemctl daemon-reload
-
-$ sudo systemctl enable unlocker-daemon
-
-$ sudo systemctl start unlocker-daemon
-
-$ ./remote-linux-pair
+user@machine:.../linux-daemon$ ./remote-linux-pair
 ```
-
diff --git a/android-application/RemoteLinuxUnlocker/.idea/.gitignore b/android-application/RemoteLinuxUnlocker/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/android-application/RemoteLinuxUnlocker/.idea/AndroidProjectSystem.xml b/android-application/RemoteLinuxUnlocker/.idea/AndroidProjectSystem.xml
new file mode 100644
index 0000000..4a53bee
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/caches/deviceStreaming.xml b/android-application/RemoteLinuxUnlocker/.idea/caches/deviceStreaming.xml
new file mode 100644
index 0000000..97cf2b8
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/caches/deviceStreaming.xml
@@ -0,0 +1,1138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceStreaming">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Sony" />
+          <option name="codename" value="A402SO" />
+          <option name="id" value="A402SO" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Sony" />
+          <option name="name" value="Xperia 10" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2520" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OnePlus" />
+          <option name="codename" value="OP535DL1" />
+          <option name="id" value="OP535DL1" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="OnePlus" />
+          <option name="name" value="CPH2409" />
+          <option name="screenDensity" value="401" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2412" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OnePlus" />
+          <option name="codename" value="OP5552L1" />
+          <option name="id" value="OP5552L1" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="OnePlus" />
+          <option name="name" value="CPH2415" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2412" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="OnePlus" />
+          <option name="codename" value="OP5552L1" />
+          <option name="id" value="OP5552L1" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="OnePlus" />
+          <option name="name" value="CPH2415" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2412" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OPPO" />
+          <option name="codename" value="OP573DL1" />
+          <option name="id" value="OP573DL1" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="OPPO" />
+          <option name="name" value="CPH2557" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB330FU" />
+          <option name="formFactor" value="Tablet" />
+          <option name="id" value="TB330FU" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab M11" />
+          <option name="screenDensity" value="240" />
+          <option name="screenX" value="1200" />
+          <option name="screenY" value="1920" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a05s" />
+          <option name="id" value="a05s" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A05s" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a06" />
+          <option name="id" value="a06" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A06" />
+          <option name="screenDensity" value="300" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a14m" />
+          <option name="id" value="a14m" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A145R" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2408" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15" />
+          <option name="id" value="a15" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A15" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15x" />
+          <option name="id" value="a15x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A15 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a16" />
+          <option name="id" value="a16" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A165M" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a16x" />
+          <option name="id" value="a16x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A16 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a26x" />
+          <option name="id" value="a26x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A266B" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a34x" />
+          <option name="id" value="a34x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A346N" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a35x" />
+          <option name="id" value="a35x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A35" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a35x" />
+          <option name="id" value="a35x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A35" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a36xq" />
+          <option name="id" value="a36xq" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A366E" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a36xq" />
+          <option name="id" value="a36xq" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A366E" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a56x" />
+          <option name="id" value="a56x" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-A566E" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="arcfox" />
+          <option name="id" value="arcfox" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="razr plus 2024" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="1272" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="austin" />
+          <option name="id" value="austin" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g 5G (2022)" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b6q" />
+          <option name="id" value="b6q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Flip 6" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2640" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="google" />
+          <option name="codename" value="blazer" />
+          <option name="id" value="blazer" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 10 Pro" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2410" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="default" value="true" />
+          <option name="id" value="comet" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="default" value="true" />
+          <option name="id" value="comet" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm1q" />
+          <option name="id" value="dm1q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="S23" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm2q" />
+          <option name="id" value="dm2q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="S23 Plus" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="dubai" />
+          <option name="id" value="dubai" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 30" />
+          <option name="screenDensity" value="405" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="default" value="true" />
+          <option name="id" value="e1q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="default" value="true" />
+          <option name="id" value="e1q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e3q" />
+          <option name="id" value="e3q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24 Ultra" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e3q" />
+          <option name="id" value="e3q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24 Ultra" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="eos" />
+          <option name="id" value="eos" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Eos" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="fogona" />
+          <option name="id" value="fogona" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g play - 2024" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="fogos" />
+          <option name="id" value="fogos" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g34 5G" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="google" />
+          <option name="codename" value="frankel" />
+          <option name="id" value="frankel" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 10" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="g0q" />
+          <option name="id" value="g0q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S906U1" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gta9pwifi" />
+          <option name="id" value="gta9pwifi" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-X210" />
+          <option name="screenDensity" value="240" />
+          <option name="screenX" value="1200" />
+          <option name="screenY" value="1920" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts7lwifi" />
+          <option name="id" value="gts7lwifi" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-T870" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts7xllite" />
+          <option name="id" value="gts7xllite" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-T738U" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="formFactor" value="Tablet" />
+          <option name="id" value="gts8uwifi" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8wifi" />
+          <option name="formFactor" value="Tablet" />
+          <option name="id" value="gts8wifi" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8" />
+          <option name="screenDensity" value="274" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts9fe" />
+          <option name="id" value="gts9fe" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S9 FE 5G" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="2304" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts9wifi" />
+          <option name="id" value="gts9wifi" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-X710" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="kansas" />
+          <option name="id" value="kansas" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g - 2025" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1604" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="lamul" />
+          <option name="id" value="lamul" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g05" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1604" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="lion" />
+          <option name="id" value="lion" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g04" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1612" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="lyriq" />
+          <option name="id" value="lyriq" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 40" />
+          <option name="screenDensity" value="400" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="manaus" />
+          <option name="id" value="manaus" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 40 neo" />
+          <option name="screenDensity" value="400" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="maui" />
+          <option name="id" value="maui" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g play - 2023" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="google" />
+          <option name="codename" value="mustang" />
+          <option name="id" value="mustang" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 10 Pro XL" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2404" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="o1q" />
+          <option name="id" value="o1q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21" />
+          <option name="screenDensity" value="421" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="pa2q" />
+          <option name="id" value="pa2q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="S25+" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="pa3q" />
+          <option name="id" value="pa3q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S25 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="pa3q" />
+          <option name="id" value="pa3q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S25 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="psq" />
+          <option name="id" value="psq" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S25 Edge" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q6q" />
+          <option name="id" value="q6q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1856" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="formFactor" value="Wear OS" />
+          <option name="id" value="r11" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="r11q" />
+          <option name="id" value="r11q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S711U" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="r9q" />
+          <option name="id" value="r9q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21 FE 5G" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="google" />
+          <option name="codename" value="rango" />
+          <option name="id" value="rango" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 10 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="t2q" />
+          <option name="id" value="t2q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21 Plus" />
+          <option name="screenDensity" value="394" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="formFactor" value="Tablet" />
+          <option name="id" value="tangorpro" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tegu" />
+          <option name="id" value="tegu" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="default" value="true" />
+          <option name="id" value="tokay" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="default" value="true" />
+          <option name="id" value="tokay" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="default" value="true" />
+          <option name="id" value="tokay" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="xcover7" />
+          <option name="id" value="xcover7" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-G556B" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2408" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="y2q" />
+          <option name="id" value="y2q" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="S20 Plus 5G" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3200" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/compiler.xml b/android-application/RemoteLinuxUnlocker/.idea/compiler.xml
index 96cc43e..b86273d 100644
--- a/android-application/RemoteLinuxUnlocker/.idea/compiler.xml
+++ b/android-application/RemoteLinuxUnlocker/.idea/compiler.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/deploymentTargetSelector.xml b/android-application/RemoteLinuxUnlocker/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..461095e
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+      <SelectionState runConfigName="ComputerListActivity">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-12-14T07:56:23.954499351Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="Default" identifier="serial=192.168.0.69:34769;connection=0fecae18" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/deviceManager.xml b/android-application/RemoteLinuxUnlocker/.idea/deviceManager.xml
new file mode 100644
index 0000000..91f9558
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/deviceManager.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/dictionaries/project.xml b/android-application/RemoteLinuxUnlocker/.idea/dictionaries/project.xml
new file mode 100644
index 0000000..4b8f2fb
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/dictionaries/project.xml
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="project">
+    <words>
+      <w>maxchehab</w>
+      <w>remotelinuxunlocker</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/gradle.xml b/android-application/RemoteLinuxUnlocker/.idea/gradle.xml
index 7ac24c7..88e9c3c 100644
--- a/android-application/RemoteLinuxUnlocker/.idea/gradle.xml
+++ b/android-application/RemoteLinuxUnlocker/.idea/gradle.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
+            <option value="/mnt/data/home/dither/Documents/GitHub/Remote-Linux-Unlocker/android-application/RemoteLinuxUnlocker" />
+            <option value="/mnt/data/home/dither/Documents/GitHub/Remote-Linux-Unlocker/android-application/RemoteLinuxUnlocker/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/android-application/RemoteLinuxUnlocker/.idea/inspectionProfiles/Project_Default.xml b/android-application/RemoteLinuxUnlocker/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..da6ad68
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,android.content.Context,obtainStyledAttributes" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/migrations.xml b/android-application/RemoteLinuxUnlocker/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/misc.xml b/android-application/RemoteLinuxUnlocker/.idea/misc.xml
index f1c4621..da3439f 100644
--- a/android-application/RemoteLinuxUnlocker/.idea/misc.xml
+++ b/android-application/RemoteLinuxUnlocker/.idea/misc.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/android-application/RemoteLinuxUnlocker/.idea/modules.xml b/android-application/RemoteLinuxUnlocker/.idea/modules.xml
deleted file mode 100644
index 0d01919..0000000
--- a/android-application/RemoteLinuxUnlocker/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/RemoteLinuxUnlocker.iml" filepath="$PROJECT_DIR$/RemoteLinuxUnlocker.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/.idea/runConfigurations.xml b/android-application/RemoteLinuxUnlocker/.idea/runConfigurations.xml
index 7f68460..72f00ed 100644
--- a/android-application/RemoteLinuxUnlocker/.idea/runConfigurations.xml
+++ b/android-application/RemoteLinuxUnlocker/.idea/runConfigurations.xml
@@ -3,6 +3,14 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/android-application/RemoteLinuxUnlocker/app/app-release.apk b/android-application/RemoteLinuxUnlocker/app/app-release_old.apk
similarity index 100%
rename from android-application/RemoteLinuxUnlocker/app/app-release.apk
rename to android-application/RemoteLinuxUnlocker/app/app-release_old.apk
diff --git a/android-application/RemoteLinuxUnlocker/app/build.gradle b/android-application/RemoteLinuxUnlocker/app/build.gradle
index a2b793e..2832fff 100644
--- a/android-application/RemoteLinuxUnlocker/app/build.gradle
+++ b/android-application/RemoteLinuxUnlocker/app/build.gradle
@@ -1,35 +1,40 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 36
+    // buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "com.maxchehab.remotelinuxunlocker"
-        minSdkVersion 15
-        targetSdkVersion 25
+        minSdkVersion 26
+        targetSdkVersion 36
         vectorDrawables.useSupportLibrary = true
         versionCode 1
-        versionName "1.0"
+        versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace = "com.maxchehab.remotelinuxunlocker"
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.google.code.gson:gson:2.8.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'de.hdodenhof:circleimageview:2.1.0'
-    testCompile 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.google.code.gson:gson:2.13.2'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/android-application/RemoteLinuxUnlocker/app/release/app-release.apk b/android-application/RemoteLinuxUnlocker/app/release/app-release.apk
new file mode 100644
index 0000000..cab2c28
Binary files /dev/null and b/android-application/RemoteLinuxUnlocker/app/release/app-release.apk differ
diff --git a/android-application/RemoteLinuxUnlocker/app/release/output-metadata.json b/android-application/RemoteLinuxUnlocker/app/release/output-metadata.json
new file mode 100644
index 0000000..37bc402
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/release/output-metadata.json
@@ -0,0 +1,21 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.maxchehab.remotelinuxunlocker",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "2.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "minSdkVersionForDexing": 26
+}
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/AndroidManifest.xml b/android-application/RemoteLinuxUnlocker/app/src/main/AndroidManifest.xml
index a27b742..992dae2 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/AndroidManifest.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.maxchehab.remotelinuxunlocker">
-
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"
+        tools:ignore="ForegroundServicesPolicy" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -14,16 +14,17 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".ComputerListActivity"
-            android:label="Remote Linux Unlocker">
+            android:label="Remote Linux Unlocker"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".PairingActivity" />
+        <activity android:name=".SettingsActivity" />
 
-        <activity android:name=".LockComputer" android:label="Lock My Computer">
+        <activity android:name=".LockComputer" android:label="Lock My Computer" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -31,13 +32,23 @@
         </activity>
 
 
-        <activity android:name=".UnlockComputer" android:label="Unlock My Computer">
+        <activity android:name=".UnlockComputer" android:label="Unlock My Computer" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <service android:name=".PersistenceService"
+            android:enabled="true"
+            android:exported="false" />
 
+        <receiver android:name=".PersistenceReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.USER_PRESENT" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/Client.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/Client.java
index bb11c87..ac3e965 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/Client.java
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/Client.java
@@ -1,24 +1,21 @@
 package com.maxchehab.remotelinuxunlocker;
 
-import android.os.AsyncTask;
 import android.util.Log;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.net.UnknownHostException;
+import java.util.concurrent.Callable;
 
-public class Client extends AsyncTask<Void, String, String> {
-
-    String host;
-    int port;
-    String message;
+public class Client implements Callable<String> {
+    final String host;
+    final int port;
+    final String message;
 
     Client(String host, int port,String message) {
         this.host = host;
@@ -27,7 +24,7 @@ public class Client extends AsyncTask<Void, String, String> {
     }
 
     @Override
-    protected String doInBackground(Void... arg0) {
+    public String call() {
         Socket socket = null;
         try {
             InetAddress address = InetAddress.getByName(host);
@@ -44,7 +41,7 @@ protected String doInBackground(Void... arg0) {
 
             BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             String response = in.readLine();
-            Log.d("async-client","recieved message: " + response);
+            Log.d("async-client","received message: " + response);
             return response;
         } catch (IOException exception) {
             Log.d("async-client", "the server is offline?");
@@ -54,16 +51,11 @@ protected String doInBackground(Void... arg0) {
                 try {
                     socket.close();
                 } catch (IOException e) {
+                    //noinspection CallToPrintStackTrace
                     e.printStackTrace();
                 }
             }
         }
         return null;
     }
-
-    @Override
-    protected void onPostExecute(String result) {
-        super.onPostExecute(result);
-    }
-
 }
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ClientBuilder.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ClientBuilder.java
new file mode 100644
index 0000000..207369f
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ClientBuilder.java
@@ -0,0 +1,27 @@
+package com.maxchehab.remotelinuxunlocker;
+
+public class ClientBuilder {
+
+    private String host;
+    private int port;
+    private String message;
+
+    public ClientBuilder setHost(String host) {
+        this.host = host;
+        return this;
+    }
+
+    public ClientBuilder setPort(int port) {
+        this.port = port;
+        return this;
+    }
+
+    public ClientBuilder setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public Client createClient() {
+        return new Client(host, port, message);
+    }
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerLayout.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerLayout.java
index bc2a49a..8ef63fb 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerLayout.java
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerLayout.java
@@ -1,19 +1,24 @@
 package com.maxchehab.remotelinuxunlocker;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.CardView;
 import android.util.Log;
-import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Created by Max on 5/10/2017.
@@ -21,14 +26,19 @@
 
 public class ComputerLayout extends CardView{
 
-    public ComputerLayout(Context context, String ip, String key) {
+
+    public ComputerLayout(Context context) {
+        super(context);
+    }
+
+    public ComputerLayout(Context context, KeyPair key) {
         super(context);
-        init(ip,key,null);
+        init(context, key,null);
     }
 
-    public ComputerLayout(Context context, String ip, String key, String command) {
+    public ComputerLayout(Context context, KeyPair key, String command) {
         super(context);
-        init(ip,key, command);
+        init(context, key, command);
     }
 
     private TextView hostname;
@@ -36,82 +46,101 @@ public ComputerLayout(Context context, String ip, String key, String command) {
 
     private boolean locked = false;
 
-    private void init(final String ip, final String key, String command) {
-
+    private void init(Context context, KeyPair key, String command) {
         inflate(getContext(), R.layout.computer_layout, this);
-        hostname = (TextView) findViewById(R.id.hostname);
-        lockButton = (Button) findViewById(R.id.lockButton);
-
-        status(ip, key);
-
-        lockButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                lockButton.setEnabled(false);
-                lockButton.setClickable(false);
-                if(locked){
-                    lock(ip,key,"unlock");
-                }else{
-                    lock(ip, key,"lock");
-                }
+        hostname = findViewById(R.id.hostname);
+        hostname.setText(String.format("%s@%s", key.user, key.ip));
+        lockButton = findViewById(R.id.lockButton);
+        ExecutorService executor2 = Executors.newSingleThreadExecutor();
+        Handler handler = new Handler(Looper.getMainLooper());
+        AtomicBoolean failed = new AtomicBoolean(false);
+        executor2.execute(() -> {
+            StatusResult result = status(key);
+            if (result != null) {
+                handler.post(() -> applyResult(context, result, key));
+            } else {
+                failed.set(true);
+            }
+        });
+        if (failed.get()) {
+            command = null;
+        }
+
+        lockButton.setOnClickListener(view -> {
+            lockButton.setEnabled(false);
+            lockButton.setClickable(false);
+            int color = ContextCompat.getColor(context, R.color.warningColorAccent);
+            lockButton.setBackgroundTintList(ColorStateList.valueOf(color));
+            lockButton.setText(R.string.loading_placeholder);
+            invalidate();
+            if(locked){
+                lock(context, key,"unlock");
+            }else{
+                lock(context, key,"lock");
             }
         });
 
         if(command != null){
-            lock(ip,key,command);
+            lock(context, key, command);
         }
     }
-
-    private void lock(String ip, String key, String action){
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+    /** @noinspection CallToPrintStackTrace*/
+    private void lock(Context context, KeyPair key, String action){
         try {
-            new Client(ip,61599,"{\"command\":\"" + action + "\",\"key\":\"" +  key + "\"}").execute().get(2, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-        } catch (TimeoutException e) {
+            executor.submit(new ClientBuilder().setHost(key.ip).setPort(61599).setMessage("{\"command\":\"" + action + "\",\"key\":\"" + key.key + "\"}").createClient()).get(2, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
             e.printStackTrace();
         }
-        boolean tempLocked = locked;
-        while(tempLocked == locked){
-            status(ip,key);
+        ExecutorService executor2 = Executors.newSingleThreadExecutor();
+        Handler handler = new Handler(Looper.getMainLooper());
+        executor2.execute(() -> {
+            boolean tempLocked = locked;
+            while(tempLocked == locked){
+                StatusResult result = status(key);
+                if (result != null && result.locked != locked) {
+                    handler.post(() -> applyResult(context, result, key));
+                }
+            }
+        });
+    }
+
+    private record StatusResult(String hostname, boolean locked){}
+
+    private void applyResult(Context context, StatusResult result, KeyPair key) {
+        locked = result.locked;
+        hostname.setText(String.format("%s@%s", key.user, result.hostname));
+        if(locked){
+            int color = ContextCompat.getColor(context, R.color.dangerColorAccent);
+            lockButton.setBackgroundTintList(ColorStateList.valueOf(color));
+            lockButton.setText(R.string.unlock);
+        } else {
+            int color = ContextCompat.getColor(context, R.color.successColorAccent);
+            lockButton.setBackgroundTintList(ColorStateList.valueOf(color));
+            lockButton.setText(R.string.lock);
         }
         lockButton.setClickable(true);
         lockButton.setEnabled(true);
     }
 
 
-    private void status(String ip, String key){
+    /** @noinspection CallToPrintStackTrace*/
+    private StatusResult status(KeyPair key){
         String echoResponse = null;
         try {
-            echoResponse = new Client(ip,61599,"{\"command\":\"status\",\"key\":\"" +  key + "\"}").execute().get(2, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-        } catch (TimeoutException e) {
+            echoResponse = executor.submit(new ClientBuilder().setHost(key.ip).setPort(61599).setMessage("{\"command\":\"status\",\"key\":\"" + key.key + "\"}").createClient()).get(2, TimeUnit.SECONDS);
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
             e.printStackTrace();
         }
 
         Log.d("status-response","Response: " + echoResponse);
 
-        if(echoResponse == null){
-            this.setVisibility(View.GONE);
-        }else{
-            this.setVisibility(View.VISIBLE);
-            JsonParser jp = new JsonParser();
-            JsonElement root = jp.parse(echoResponse);
-            JsonObject rootobj = root.getAsJsonObject();
-            Log.d("hostname",rootobj.get("hostname").getAsString());
-            hostname.setText(rootobj.get("hostname").getAsString());
-            locked = rootobj.get("isLocked").getAsBoolean();
-
-            if(locked){
-                lockButton.setText("Unlock");
-            }else{
-                lockButton.setText("Lock");
-            }
+        if(echoResponse != null) {
+            JsonObject rootObj = JsonParser.parseString(echoResponse).getAsJsonObject();
+            Log.d("hostname",rootObj.get("hostname").getAsString());
+            return new StatusResult(rootObj.get("hostname").getAsString(), rootObj.get("isLocked").getAsBoolean());
         }
+        return null;
     }
 
 }
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerListActivity.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerListActivity.java
index 0588e09..e0283b7 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerListActivity.java
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ComputerListActivity.java
@@ -1,71 +1,65 @@
 package com.maxchehab.remotelinuxunlocker;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Color;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
+import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
-import java.math.BigInteger;
-import java.security.SecureRandom;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Random;
 
 public class ComputerListActivity extends AppCompatActivity {
 
-    private static Random rnd = new Random();
+    private static final Random rnd = new Random();
     private SwipeRefreshLayout swipeContainer;
     boolean commanded = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_computer_list);
 
-
-
-        SharedPreferences sharedPref = getSharedPreferences("data", MODE_PRIVATE);
-        if(!sharedPref.contains("key")){
-            SharedPreferences.Editor editor = sharedPref.edit();
-            editor.putString("key", new BigInteger(getRandomNumber(64)).toString());
-            editor.commit();
-        }
-        if(!sharedPref.contains("ips")){
-            SharedPreferences.Editor editor = sharedPref.edit();
-            editor.putString("ips", "");
-            editor.commit();
+        Settings settings = new Settings(this);
+//        if (settings.unlockHook) {
+        {
+            Intent intent = new Intent(this, PersistenceService.class);
+            intent.putExtra("create", settings.unlockHook);
+            startForegroundService(intent);
         }
 
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_computer_list);
+        Button buttonPair = findViewById(R.id.buttonPair);
+        buttonPair.setOnClickListener(view -> {
+            Intent intent = new Intent(this, PairingActivity.class);
+            startActivity(intent);
+        });
+        Button buttonSettings = findViewById(R.id.buttonSettings);
+        buttonSettings.setOnClickListener(view -> {
+            Intent intent = new Intent(this, SettingsActivity.class);
+            startActivity(intent);
+        });
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), PairingActivity.class);
-                startActivity(intent);
+        Button buttonManage = findViewById(R.id.buttonCommit);
+        buttonManage.setOnClickListener(view -> {
+            if (buttonManage.getText().toString().equals("Back")) {
+                buttonManage.setText(R.string.manage_devices);
+                refreshComputerList();
+            } else {
+                buttonManage.setText(R.string.back);
+                deleteComputerList();
             }
         });
 
 
-        swipeContainer = (SwipeRefreshLayout) findViewById(R.id.refresh);
+        swipeContainer = findViewById(R.id.refresh);
         // Setup refresh listener which triggers new data loading
-        swipeContainer.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                refreshComputerList();
-            }
-        });
+        swipeContainer.setOnRefreshListener(this::refreshComputerList);
         // Configure the refreshing colors
-        swipeContainer.setColorSchemeResources(R.color.colorAccent);
+        swipeContainer.setColorSchemeResources(R.color.defaultColorAccent);
 
         refreshComputerList();
     }
@@ -73,7 +67,7 @@ public void onRefresh() {
     @Override
     protected void onResume() {
         if (getIntent().getAction() != null) {
-            Log.e("INTENT-ACTION:",getIntent().getAction().toString());
+            Log.e("INTENT-ACTION:", getIntent().getAction());
         }
         refreshComputerList();
 
@@ -81,33 +75,50 @@ protected void onResume() {
     }
 
     public void refreshComputerList(){
-        SharedPreferences sharedPref = getSharedPreferences("data", MODE_PRIVATE);
-        String key = sharedPref.getString("key",null);
-        Log.d("ips",sharedPref.getString("ips",null));
-        String ipString = sharedPref.getString("ips",null);
-        List<String> ips = new ArrayList<String>();
-        if(ipString.length() > 0){
-            ips = Arrays.asList(sharedPref.getString("ips",null).split(","));
-            ips = new ArrayList<String>(ips);
+        TextView infoBar = findViewById(R.id.infoBar);
+        ArrayList<View> computerList = new ArrayList<>();
+        KeyPairList keys = new KeyPairList(this);
+        if (keys.isEmpty()) {
+            infoBar.setVisibility(View.VISIBLE);
+        } else {
+            infoBar.setVisibility(View.GONE);
+        }
+        for (KeyPair k: keys) {
+            if (!commanded && getIntent().hasExtra("command")) {
+                computerList.add(new ComputerLayout(this, k, getIntent().getStringExtra("command")));
+                commanded = true;
+            } else {
+                computerList.add(new ComputerLayout(this, k));
+            }
         }
-        ArrayList<View> computerList = new ArrayList<View>();
 
-        for(int i = 0 ; i < ips.size(); i++){
-            if(ips.get(i).length() > 0){
-                Log.d("creating-ip",ips.get(i));
+        LinearLayout feedLayout = findViewById(R.id.CardHolder);
+        feedLayout.removeAllViews();
 
-                if(!commanded && getIntent().hasExtra("command")){
 
-                    computerList.add(new ComputerLayout(this,ips.get(i),key,getIntent().getStringExtra("command")));
-                    commanded = true;
-                }else{
-                    computerList.add(new ComputerLayout(this,ips.get(i),key));
-                }
+        for(int i = 0; i < computerList.size(); i++){
+            feedLayout.addView(computerList.get(i));
+        }
+        swipeContainer.setRefreshing(false);
+    }
 
+    public void deleteComputerList() {
+        TextView infoBar = findViewById(R.id.infoBar);
+        ArrayList<View> computerList = new ArrayList<>();
+        KeyPairList keys = new KeyPairList(this);
+        if (keys.isEmpty()) {
+            infoBar.setVisibility(View.VISIBLE);
+        } else {
+            infoBar.setVisibility(View.GONE);
+        }
+        for (KeyPair k: keys) {
+            computerList.add(new ManageLayout(this, k));
+            if (!commanded && getIntent().hasExtra("command")) {
+                commanded = true;
             }
         }
 
-        LinearLayout feedLayout = (LinearLayout) findViewById(R.id.list);
+        LinearLayout feedLayout = findViewById(R.id.CardHolder);
         feedLayout.removeAllViews();
 
 
@@ -123,5 +134,5 @@ public static String getRandomNumber(int digCount) {
             sb.append((char)('0' + rnd.nextInt(10)));
         return sb.toString();
     }
-
 }
+
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/InfoRowView.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/InfoRowView.java
new file mode 100644
index 0000000..c815712
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/InfoRowView.java
@@ -0,0 +1,40 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+
+public class InfoRowView extends LinearLayout {
+
+    private final TextView helpText;
+
+    public InfoRowView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setOrientation(VERTICAL);
+        LayoutInflater.from(context).inflate(R.layout.view_info_row, this, true);
+        FrameLayout container = findViewById(R.id.contentContainer);
+        ImageView infoBtn = findViewById(R.id.infoBtn);
+        helpText = findViewById(R.id.helpText);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.InfoRowView);
+        String info = a.getString(R.styleable.InfoRowView_infoText);
+        int contentLayout = a.getResourceId(R.styleable.InfoRowView_contentLayout, 0);
+        a.recycle();
+        if (info != null) {
+            helpText.setText(info);
+        } else {
+            infoBtn.setVisibility(GONE);
+        }
+        if (contentLayout != 0) {
+            LayoutInflater.from(context).inflate(contentLayout, container, true);
+        }
+        infoBtn.setOnClickListener(v -> {
+            helpText.setVisibility(helpText.getVisibility() == VISIBLE ? GONE : VISIBLE);
+        });
+    }
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/KeyPair.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/KeyPair.java
new file mode 100644
index 0000000..841af7b
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/KeyPair.java
@@ -0,0 +1,29 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import static com.maxchehab.remotelinuxunlocker.ComputerListActivity.getRandomNumber;
+
+import java.math.BigInteger;
+import java.util.Objects;
+
+public class KeyPair {
+    final String ip;
+    final String key;
+    String user;
+
+    boolean unlock;
+
+    KeyPair(String ip) {
+        this.ip = ip;
+        this.key = new BigInteger(getRandomNumber(64)).toString();
+        this.user = "";
+        this.unlock = false;
+    }
+
+    public boolean containsIp(String ip) {
+        return Objects.equals(this.ip, ip);
+    }
+    public boolean containsUser(String user) {
+        return Objects.equals(this.user, user);
+    }
+}
+
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/KeyPairList.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/KeyPairList.java
new file mode 100644
index 0000000..95476e7
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/KeyPairList.java
@@ -0,0 +1,66 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.google.gson.Gson;
+
+import java.util.ArrayList;
+import java.util.Objects;
+
+public class KeyPairList extends ArrayList<KeyPair> {
+    public boolean containsKey(KeyPair key) {
+        for (KeyPair k: this) {
+            if (k.containsIp(key.ip) && k.containsUser(key.user)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    public void addKey(KeyPair key) {
+        this.add(key);
+    }
+    /** @noinspection BooleanMethodIsAlwaysInverted*/
+    public boolean removeKey(KeyPair key) {
+        for (KeyPair k : this) {
+            if (Objects.equals(k.ip, key.ip) && Objects.equals(k.user, key.user)) {
+                this.remove(k);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void commitKeys(Context context) {
+        String serialized = new Gson().toJson(this);
+        SharedPreferences sharedPref = context.getSharedPreferences("data", MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        editor.putString("keysets", serialized);
+        editor.apply();
+    }
+    /** @noinspection CallToPrintStackTrace*/
+    public KeyPairList(Context context) {
+        SharedPreferences sharedPref = context.getSharedPreferences("data", MODE_PRIVATE);
+        if(!sharedPref.contains("keysets")){
+            SharedPreferences.Editor editor = sharedPref.edit();
+            editor.putString("keysets", "");
+            editor.apply();
+        }
+        String data = sharedPref.getString("keysets",null);
+        try {
+            KeyPairList list = new Gson().fromJson(data, KeyPairList.class);
+            if (list == null || list.isEmpty()) {
+                return;
+            }
+            this.addAll(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+            KeyPairList empty = new KeyPairList();
+            empty.commitKeys(context);
+        }
+    }
+
+    public KeyPairList(){}
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ManageLayout.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ManageLayout.java
new file mode 100644
index 0000000..bef390a
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/ManageLayout.java
@@ -0,0 +1,107 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.CardView;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class ManageLayout extends CardView {
+
+    public ManageLayout(Context context) {
+        super(context);
+    }
+
+    public ManageLayout(Context context, KeyPair key) {
+        super(context);
+        init(context, key);
+    }
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+    private static final Handler handler = new Handler(Looper.getMainLooper());
+    private TextView deetsBar;
+
+    private void init(Context context, KeyPair key) {
+        ExecutorService executor2 = Executors.newSingleThreadExecutor();
+        inflate(getContext(), R.layout.manage_layout, this);
+        deetsBar = findViewById(R.id.deetsBar);
+        Button deleteComputer = findViewById(R.id.deleteComputer);
+        deleteComputer.setOnClickListener(view -> {
+            deleteIp(context, key);
+            setVisibility(View.GONE);
+        });
+        Button unlockComputer = findViewById(R.id.unlockComputer);
+        if (key.unlock) {
+            int color = ContextCompat.getColor(context, R.color.successColorAccent);
+            unlockComputer.setBackgroundTintList(ColorStateList.valueOf(color));
+            unlockComputer.setText(R.string.lock);
+        }
+        unlockComputer.setOnClickListener(view -> {
+            KeyPairList keys = new KeyPairList(context);
+            if (!keys.removeKey(key)) {
+                System.out.println("Key not found.");
+            }
+            key.unlock = !key.unlock;
+            keys.add(key);
+            keys.commitKeys(context);
+            if (key.unlock) {
+                int color = ContextCompat.getColor(context, R.color.successColorAccent);
+                unlockComputer.setBackgroundTintList(ColorStateList.valueOf(color));
+                unlockComputer.setText(R.string.lock);
+            } else {
+                int color = ContextCompat.getColor(context, R.color.dangerColorAccent);
+                unlockComputer.setBackgroundTintList(ColorStateList.valueOf(color));
+                unlockComputer.setText(R.string.unlock);
+            }
+        });
+        deetsBar.setText(String.format("%s@%s", key.user, key.ip));
+        executor2.execute(() -> {
+            String hostname = status(key);
+            handler.post(() -> {
+                if (hostname != null) {
+                    deetsBar.setText(String.format("%s@%s (%s)", key.user, key.ip, hostname));
+                }
+            });
+        });
+    }
+
+    void deleteIp(Context context, KeyPair key) {
+        KeyPairList keys = new KeyPairList(context);
+        if (!keys.removeKey(key)) {
+            System.out.println("Key not found.");
+        }
+        keys.commitKeys(context);
+    }
+    /** @noinspection CallToPrintStackTrace*/
+    private String status(KeyPair key) {
+        String echoResponse = null;
+        try {
+            echoResponse = executor.submit(new ClientBuilder().setHost(key.ip).setPort(61599).setMessage("{\"command\":\"status\",\"key\":\"" + key.key + "\"}").createClient()).get(2, TimeUnit.SECONDS);
+        } catch (InterruptedException | TimeoutException | ExecutionException e) {
+            e.printStackTrace();
+        }
+
+        Log.d("status-response","Response: " + echoResponse);
+
+        if(echoResponse != null) {
+            JsonObject rootObj = JsonParser.parseString(echoResponse).getAsJsonObject();
+            Log.d("hostname", rootObj.get("hostname").getAsString());
+            return rootObj.get("hostname").getAsString();
+        }
+        return null;
+    }
+
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PairingActivity.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PairingActivity.java
index f7e6e25..949bdb3 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PairingActivity.java
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PairingActivity.java
@@ -1,100 +1,83 @@
 package com.maxchehab.remotelinuxunlocker;
 
-import android.content.Intent;
-import android.content.SharedPreferences;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.InputFilter;
-import android.text.Spanned;
 import android.util.Log;
-import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 public class PairingActivity extends AppCompatActivity {
 
     private EditText ipInput;
-    private Button pairButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_pairing);
 
-        ipInput = (EditText)findViewById(R.id.ipInput);
-        pairButton = (Button)findViewById(R.id.pairButton);
+        ipInput = findViewById(R.id.ipInput);
+        Button pairButton = findViewById(R.id.pairButton);
 
         InputFilter[] filters = new InputFilter[1];
-        filters[0] = new InputFilter() {
-            @Override
-            public CharSequence filter(CharSequence source, int start,
-                                       int end, Spanned dest, int dstart, int dend) {
-                if (end > start) {
-                    String destTxt = dest.toString();
-                    String resultingTxt = destTxt.substring(0, dstart) +
-                            source.subSequence(start, end) +
-                            destTxt.substring(dend);
-                    if (!resultingTxt.matches ("^\\d{1,3}(\\." +
-                            "(\\d{1,3}(\\.(\\d{1,3}(\\.(\\d{1,3})?)?)?)?)?)?")) {
-                        return "";
-                    } else {
-                        String[] splits = resultingTxt.split("\\.");
-                        for (int i=0; i<splits.length; i++) {
-                            if (Integer.valueOf(splits[i]) > 255) {
-                                return "";
-                            }
+        filters[0] = (source, start, end, dest, dstart, dend) -> {
+            if (end > start) {
+                String destTxt = dest.toString();
+                String resultingTxt = destTxt.substring(0, dstart) +
+                        source.subSequence(start, end) +
+                        destTxt.substring(dend);
+                if (!resultingTxt.matches ("^\\d{1,3}(\\." +
+                        "(\\d{1,3}(\\.(\\d{1,3}(\\.(\\d{1,3})?)?)?)?)?)?")) {
+                    return "";
+                } else {
+                    String[] splits = resultingTxt.split("\\.");
+                    for (String split : splits) {
+                        if (Integer.parseInt(split) > 255) {
+                            return "";
                         }
                     }
                 }
-                return null;
             }
+            return null;
         };
         ipInput.setFilters(filters);
 
-        pairButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                pair();
-            }
-        });
+        pairButton.setOnClickListener(view -> pair());
+        Button buttonBack = findViewById(R.id.buttonBack);
+        buttonBack.setOnClickListener(view -> finish());
     }
-
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+    /** @noinspection CallToPrintStackTrace*/
     void pair(){
-        SharedPreferences sharedPref = getSharedPreferences("data", MODE_PRIVATE);
-        String key = sharedPref.getString("key",null);
-        String ipString = sharedPref.getString("ips",null);
-        List<String> ips = new ArrayList<String>();
-        if(ipString.length() > 0){
-            ips = Arrays.asList(sharedPref.getString("ips",null).split(","));
-            ips = new ArrayList<String>(ips);
-        }
-        if(ips.contains(ipInput.getText().toString())){
-            ipInput.setError("IP address is already paired.");
-            return;
-        }
+        KeyPair key = new KeyPair(ipInput.getText().toString());
+        KeyPairList keys = new KeyPairList(this);
 
         try {
-            String response = new Client(ipInput.getText().toString(), 61598, "{\"command\":\"pair\",\"key\":\"" +  key + "\"}").execute().get(1, TimeUnit.SECONDS);
+            String response = executor.submit(new ClientBuilder().setHost(key.ip).setPort(61598).setMessage("{\"command\":\"pair\",\"key\":\"" + key.key + "\"}").createClient()).get(1, TimeUnit.SECONDS);
             Log.d("UI RESPONSE", "response: " + response);
             if(response == null){
                 pairFailed();
             }else{
+                JsonObject responseObject = JsonParser.parseString(response).getAsJsonObject();
+                key.user = responseObject.get("user").getAsString();
+                if (keys.containsKey(key)) {
+                    ipInput.setError("IP address is already paired with this user.");
+                    return;
+                }
+                keys.addKey(key);
+                keys.commitKeys(this);
                 pairSuccess();
             }
-        } catch (InterruptedException e) {
-            pairFailed();
-            e.printStackTrace();
-        } catch (ExecutionException e) {
-            pairFailed();
-            e.printStackTrace();
-        }catch (TimeoutException e) {
+        } catch (InterruptedException | TimeoutException | ExecutionException e) {
             pairFailed();
             e.printStackTrace();
         }
@@ -106,15 +89,6 @@ void pairFailed(){
 
     void pairSuccess(){
         ipInput.setError(null);
-
-        SharedPreferences sharedPref = getSharedPreferences("data", MODE_PRIVATE);
-        List<String> ips = Arrays.asList(sharedPref.getString("ips",null).split(","));
-        ips = new ArrayList<String>(ips);
-
-        ips.add(ipInput.getText().toString());
-        SharedPreferences.Editor editor = sharedPref.edit();
-        editor.putString("ips", android.text.TextUtils.join(",", ips));
-        editor.commit();
         finish();
     }
 
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PersistenceReceiver.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PersistenceReceiver.java
new file mode 100644
index 0000000..386c10b
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PersistenceReceiver.java
@@ -0,0 +1,29 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class PersistenceReceiver extends BroadcastReceiver
+{
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+    @Override
+    public void onReceive(Context context, Intent intent){
+        if (Intent.ACTION_USER_PRESENT.equals(intent.getAction())) {
+            KeyPairList keys = new KeyPairList(context);
+            for (KeyPair k: keys) {
+                if (k.unlock) {
+                    try {
+                        executor.submit(new ClientBuilder().setHost(k.ip).setPort(61599).setMessage("{\"command\":\"unlock\",\"key\":\"" + k.key + "\"}").createClient()).get(2, TimeUnit.SECONDS);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PersistenceService.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PersistenceService.java
new file mode 100644
index 0000000..913b2d0
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/PersistenceService.java
@@ -0,0 +1,73 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import static android.support.v4.app.ActivityCompat.requestPermissions;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.os.IBinder;
+import android.support.v4.app.NotificationCompat;
+
+public class PersistenceService extends Service {
+
+    private UnlockReceiver unlockReceiver;
+    private final String CHANNEL_ID = "PERSISTENCE_SERVICE";
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        boolean createMode = intent.getBooleanExtra("create", true);
+        if (!createMode) {
+            NotificationManager manager = getSystemService(NotificationManager.class);
+            if (manager != null) {
+                manager.deleteNotificationChannel(CHANNEL_ID);
+                return START_NOT_STICKY;
+            }
+        }
+        createNotificationChannel();
+        Notification notification = buildNotification();
+        try {
+            startForeground(1, notification);
+        } catch (Exception e) {
+            //Oh dear!
+            e.printStackTrace();
+        }
+        unlockReceiver = new UnlockReceiver();
+        IntentFilter filter = new IntentFilter(Intent.ACTION_USER_PRESENT);
+        registerReceiver(unlockReceiver, filter);
+        return START_NOT_STICKY;
+    }
+    @Override
+    public void onDestroy() {
+        unregisterReceiver(unlockReceiver);
+        super.onDestroy();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    private void createNotificationChannel() {
+        NotificationChannel serviceChannel = new NotificationChannel(CHANNEL_ID, "Disable me!", NotificationManager.IMPORTANCE_HIGH);
+        serviceChannel.setDescription("thing");
+        NotificationManager manager = getSystemService(NotificationManager.class);
+        if (manager != null) {
+            manager.createNotificationChannel(serviceChannel);
+        }
+    }
+
+    private Notification buildNotification() {
+        return new NotificationCompat.Builder(this, CHANNEL_ID)
+                .setContentTitle("Unlock with phone enabled!")
+                .setContentText("To hide this notification, please disable it in Notification Settings.")
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .build();
+    }
+
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/Settings.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/Settings.java
new file mode 100644
index 0000000..c16dce7
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/Settings.java
@@ -0,0 +1,44 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.google.gson.Gson;
+
+public class Settings {
+    boolean unlockHook = false;
+    public Settings() {}
+
+    /** @noinspection CallToPrintStackTrace*/
+    public Settings(Context context) {
+        SharedPreferences sharedPref = context.getSharedPreferences("data", MODE_PRIVATE);
+        if (!sharedPref.contains("settings")) {
+            SharedPreferences.Editor editor = sharedPref.edit();
+            editor.putString("settings", "");
+            editor.apply();
+        }
+        String data = sharedPref.getString("settings", null);
+        try {
+            Settings settings = new Gson().fromJson(data, Settings.class);
+            if (settings == null) {
+                return;
+            }
+            this.unlockHook = settings.unlockHook;
+        } catch (Exception e) {
+            e.printStackTrace();
+            Settings settings = new Settings();
+            settings.commitSettings(context);
+        }
+    }
+    @SuppressLint("ApplySharedPref")
+    public void commitSettings(Context context) {
+        String serialized = new Gson().toJson(this);
+        SharedPreferences sharedPref = context.getSharedPreferences("data", MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        editor.putString("settings", serialized);
+        editor.commit();
+    }
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/SettingsActivity.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/SettingsActivity.java
new file mode 100644
index 0000000..41c0642
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/SettingsActivity.java
@@ -0,0 +1,38 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Button;
+import android.widget.Switch;
+
+public class SettingsActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        Settings settings = new Settings(this);
+        Switch switchUnlockHook = findViewById(R.id.switchUnlockHook);
+        if (settings.unlockHook) {
+            switchUnlockHook.setChecked(true);
+        }
+
+        Button buttonCommit = findViewById(R.id.buttonCommit);
+        buttonCommit.setOnClickListener(view -> {
+            setVisible(false);
+            settings.unlockHook = switchUnlockHook.isChecked();
+            settings.commitSettings(this);
+            Intent mainActivity = new Intent(this, ComputerListActivity.class);
+            int pendingId = 0;
+            PendingIntent pendingIntent = PendingIntent.getActivity(this, pendingId, mainActivity, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+            AlarmManager manager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
+            manager.set(AlarmManager.RTC, System.currentTimeMillis() + 100, pendingIntent);
+            android.os.Process.killProcess(android.os.Process.myPid());
+        });
+        Button buttonBack = findViewById(R.id.buttonBack);
+        buttonBack.setOnClickListener(view -> finish());
+    }
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/UnlockReceiver.java b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/UnlockReceiver.java
new file mode 100644
index 0000000..7f37ce5
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/java/com/maxchehab/remotelinuxunlocker/UnlockReceiver.java
@@ -0,0 +1,31 @@
+package com.maxchehab.remotelinuxunlocker;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class UnlockReceiver extends BroadcastReceiver {
+
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+    @Override
+    public final void onReceive(Context  context, Intent intent){
+        if (Intent.ACTION_USER_PRESENT.equals(intent.getAction())) {
+            KeyPairList keys = new KeyPairList(context);
+            for (KeyPair k: keys) {
+                if (k.unlock) {
+                    try {
+                        executor.submit(new ClientBuilder().setHost(k.ip).setPort(61599).setMessage("{\"command\":\"unlock\",\"key\":\"" + k.key + "\"}").createClient()).get(2, TimeUnit.SECONDS);
+                    } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/drawable/ic_new.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/drawable/ic_new.xml
deleted file mode 100644
index 81cf155..0000000
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/drawable/ic_new.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="32.0"
-    android:viewportWidth="32.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M28,14H18V4c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2v10H4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h10v10c0,1.1 0.9,2 2,2s2,-0.9 2,-2V18h10c1.1,0 2,-0.9 2,-2S29.1,14 28,14z"/>
-</vector>
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_computer_list.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_computer_list.xml
index 3c10c01..ebcd189 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_computer_list.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_computer_list.xml
@@ -1,35 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.maxchehab.remotelinuxunlocker.ComputerListActivity">
 
+
     <android.support.v4.widget.SwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
-            android:orientation="vertical"
-            android:id="@+id/list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
 
-        </LinearLayout>
+            android:orientation="vertical">
 
-    </android.support.v4.widget.SwipeRefreshLayout>
+            <TextView
+                android:id="@+id/infoBar"
+                android:layout_width="match_parent"
+                android:layout_height="36dp"
+                android:gravity="bottom|center"
+                android:text="@string/layout_banner"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:id="@+id/CardHolder"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:orientation="vertical"/>
+
+            <HorizontalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:tint="#fff"
-        app:fabSize="normal"
-        app:srcCompat="@drawable/ic_new" />
+                <LinearLayout
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/buttonCommit"
+                        style="@style/Widget.AppCompat.Button.Colored"                android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/manage_devices" />
+
+                    <Button
+                        android:id="@+id/buttonSettings"
+                        android:theme="@style/WarningButton"                     android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/settings" />
+
+                    <Button
+                        android:id="@+id/buttonPair"
+                        android:theme="@style/SuccessButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/add_device" />
+                </LinearLayout>
+            </HorizontalScrollView>
+        </LinearLayout>
+    </android.support.v4.widget.SwipeRefreshLayout>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_lock_computer.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_lock_computer.xml
index b97736e..b2b4b75 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_lock_computer.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_lock_computer.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.maxchehab.remotelinuxunlocker.LockComputer">
-
-</android.support.constraint.ConstraintLayout>
+    tools:context="com.maxchehab.remotelinuxunlocker.LockComputer"/>
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_pairing.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_pairing.xml
index 5d020d4..f33e0b7 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_pairing.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_pairing.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.maxchehab.remotelinuxunlocker.PairingActivity">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_margin="10dp">
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:layout_margin="10dp">
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
             <TextView
                 android:layout_gravity="center_horizontal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Instructions to pair device:"
+                android:text="@string/pair_banner"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textSize="24sp" />
 
@@ -22,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:text="If you have not already installed Remote Linux Unlocker on your computer please do so. Instructions are at https://github.com/maxchehab/remote-linux-unlocker.\n\nOnce you have installed Remote Linux Unlocker on your computer run the command 'remote-linux-pair' in a terminal. Simply follow the instructions. "
+                android:text="@string/pair_instructions"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textSize="14sp" />
 
@@ -31,14 +35,35 @@
                 android:id="@+id/ipInput"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:hint="127.0.0.1"/>
+                android:hint="@string/pair_sample_ip"
+                android:inputType="phone"
+                tools:ignore="Autofill" />
             <Button
                 android:id="@+id/pairButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Pair"/>
+                android:text="@string/pair"
+                style="@style/Widget.AppCompat.Button.Colored"/>
         </LinearLayout>
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
+            <LinearLayout
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="horizontal">
 
+                <Button
+                    android:id="@+id/buttonBack"
+                    android:theme="@style/SuccessButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/back" />
 
+            </LinearLayout>
+        </HorizontalScrollView>
+    </LinearLayout>
 </android.support.constraint.ConstraintLayout>
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_settings.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..2de9829
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.maxchehab.remotelinuxunlocker.SettingsActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_margin="10dp">
+        <TextView
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_banner"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textSize="24sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:text="@string/settings_instructions"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:textSize="14sp" />
+
+        <LinearLayout
+            android:id="@+id/CardHolder"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+            <com.maxchehab.remotelinuxunlocker.InfoRowView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:infoText="Controls whether unlocking this device will unlock devices that have their `UNLOCK` setting set. Note that the `UNLOCK` setting in the `MANAGE DEVICES` menu will not work if this is set to `OFF`.">
+                <Switch
+                    android:id="@+id/switchUnlockHook"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/unlock_hook"/>
+            </com.maxchehab.remotelinuxunlocker.InfoRowView>
+        </LinearLayout>
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/buttonBack"
+                    android:theme="@style/SuccessButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/back" />
+
+                <Button
+                    android:id="@+id/buttonCommit"
+                    android:theme="@style/DangerButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/commit" />
+
+            </LinearLayout>
+        </HorizontalScrollView>
+    </LinearLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_unlock_computer.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_unlock_computer.xml
index addcda0..4e40906 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_unlock_computer.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/activity_unlock_computer.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/computer_layout.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/computer_layout.xml
index 15721b5..f39672f 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/computer_layout.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/computer_layout.xml
@@ -6,6 +6,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:baselineAligned="false"
         android:orientation="horizontal">
 
 
@@ -17,11 +18,10 @@
 
             android:orientation="vertical">
             <ImageView
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/profile_image"
                 android:layout_width="90dp"
                 android:layout_height="90dp"
                 android:layout_gravity="center_horizontal"
+                android:contentDescription="@string/ic_linux_content_description"
                 android:src="@mipmap/ic_linux"
                 android:tint="#FF000000"/>
         </LinearLayout>
@@ -29,7 +29,7 @@
 
         <LinearLayout
             android:layout_gravity="center_vertical"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="10sp"
             android:layout_weight="1"
@@ -40,24 +40,23 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
-                android:text="optimus"
                 android:textAlignment="textEnd"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-                android:textSize="30dp" />
+                android:textSize="24sp" />
 
             <Button
                 android:id="@+id/lockButton"
-                android:layout_width="wrap_content"
-                android:theme="@style/AccentButton"
                 style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_gravity="end"
-                android:layout_marginLeft="10dp"
-                android:text="Unlock"
+                android:layout_marginStart="10sp"
+                android:clickable="false"
+                android:enabled="false"
+                android:text="@string/offline"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                 android:textColor="@color/cardview_light_background"
                 android:textSize="20sp" />
-
         </LinearLayout>
     </LinearLayout>
 
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/manage_layout.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/manage_layout.xml
new file mode 100644
index 0000000..be839be
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/manage_layout.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="5dp">
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/deetsBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:gravity="start"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+                    android:textSize="15sp" />
+            </LinearLayout>
+        </HorizontalScrollView>
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/deleteComputer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="end"
+                    android:text="@string/delete"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+                    android:textColor="@color/cardview_light_background"
+                    android:textSize="20sp"
+                    android:theme="@style/DangerButton" />
+                <Button
+                android:id="@+id/unlockComputer"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_gravity="end"
+                android:text="@string/unlock"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+                android:textColor="@color/cardview_light_background"
+                android:textSize="20sp"
+                android:theme="@style/DangerButton" />
+            </LinearLayout>
+        </HorizontalScrollView>
+    </LinearLayout>
+
+
+
+
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/view_info_row.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/view_info_row.xml
new file mode 100644
index 0000000..bc626ba
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/layout/view_info_row.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+        <ImageView
+            android:id="@+id/infoBtn"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:contentDescription="@string/info"
+            android:src="@android:drawable/ic_menu_info_details" />
+            <FrameLayout
+            android:id="@+id/contentContainer"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/helpText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="4dp"
+        android:visibility="gone"/>
+
+</merge>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/attrs.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..2f49124
--- /dev/null
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/attrs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="InfoRowView">
+        <attr name="infoText" format="string"/>
+        <attr name="contentLayout" format="reference"/>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/colors.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/colors.xml
index 3ab3e9c..0e6fed2 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/colors.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/colors.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="defaultColorPrimary">#3F51B5</color>
+    <color name="defaultColorPrimaryDark">#303F9F</color>
+    <color name="defaultColorAccent">#FF4081</color>
+    <color name="dangerColorAccent">#FF1744</color>
+    <color name="successColorAccent">#00C853</color>
+    <color name="warningColorAccent">#FF9800</color>
 </resources>
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/dimens.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 59a0b0c..0000000
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">16dp</dimen>
-</resources>
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/strings.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/strings.xml
index f5ddae0..e73333c 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/strings.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/strings.xml
@@ -1,5 +1,23 @@
 <resources>
     <string name="app_name">Remote Linux Unlocker</string>
-    <string name="title_activity_computer_list">ComputerListActivity</string>
-    <string name="title_activity_lock_computer">Lock Computer</string>
+    <string name="delete">Delete</string>
+    <string name="ic_linux_content_description">Tux the Penguin inside a Computer display.</string>
+    <string name="layout_banner">Computers will appear here</string>
+    <string name="manage_devices">Manage Devices</string>
+    <string name="settings">Settings</string>
+    <string name="add_device">Add device</string>
+    <string name="pair_banner">Instructions to pair device:</string>
+    <string name="pair_instructions">If you have not already installed Remote Linux Unlocker on your computer please do so. Instructions are at https://github.com/maxchehab/remote-linux-unlocker.\n\nOnce you have installed Remote Linux Unlocker on your computer run the command \'remote-linux-pair\' in a terminal. Simply follow the instructions.</string>
+    <string name="settings_banner">Application settings:</string>
+    <string name="settings_instructions">To change this application\'s settings, please use the options below.Note that pressing `APPLY` will immediately write the changes to the configuration, and re-launch this program.\nTap the ⓘ icon above any setting for more information.</string>
+    <string name="pair_sample_ip">127.0.0.1</string>
+    <string name="pair">Pair</string>
+    <string name="unlock">Unlock</string>
+    <string name="lock">Lock</string>
+    <string name="back">Back</string>
+    <string name="commit">Apply and Relaunch</string>
+    <string name="loading_placeholder">Loading…</string>
+    <string name="offline">Offline</string>
+    <string name="unlock_hook">Enable unlock hook</string>
+    <string name="info">Info</string>
 </resources>
diff --git a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/styles.xml b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/styles.xml
index 95579de..6d4bf2c 100644
--- a/android-application/RemoteLinuxUnlocker/app/src/main/res/values/styles.xml
+++ b/android-application/RemoteLinuxUnlocker/app/src/main/res/values/styles.xml
@@ -3,23 +3,22 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimary">@color/defaultColorPrimary</item>
+        <item name="colorPrimaryDark">@color/defaultColorPrimaryDark</item>
+        <item name="colorAccent">@color/defaultColorAccent</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
+    <style name="DangerButton">
+        <item name="colorButtonNormal">@color/dangerColorAccent</item>
+        <item name="android:textColor">#FFFFFF</item>
     </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-    <style name="AccentButton" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorButtonNormal">@color/colorAccent</item>
-        <item name="android:textColor">#737373</item>
+    <style name="SuccessButton">
+        <item name="colorButtonNormal">@color/successColorAccent</item>
+        <item name="android:textColor">#535353</item>
+    </style>
+    <style name="WarningButton">
+        <item name="colorButtonNormal">@color/warningColorAccent</item>
+        <item name="android:textColor">#434343</item>
     </style>
 
 </resources>
diff --git a/android-application/RemoteLinuxUnlocker/build.gradle b/android-application/RemoteLinuxUnlocker/build.gradle
index d0aa704..6e64062 100644
--- a/android-application/RemoteLinuxUnlocker/build.gradle
+++ b/android-application/RemoteLinuxUnlocker/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:8.13.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,10 +15,11 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()  
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete layout.buildDirectory
 }
diff --git a/android-application/RemoteLinuxUnlocker/gradle/wrapper/gradle-wrapper.properties b/android-application/RemoteLinuxUnlocker/gradle/wrapper/gradle-wrapper.properties
index ad11cb9..5b715b2 100644
--- a/android-application/RemoteLinuxUnlocker/gradle/wrapper/gradle-wrapper.properties
+++ b/android-application/RemoteLinuxUnlocker/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
\ No newline at end of file
diff --git a/linux-daemon/keys.db b/linux-daemon/keys.db
deleted file mode 100644
index 1240cab..0000000
--- a/linux-daemon/keys.db
+++ /dev/null
@@ -1,2 +0,0 @@
-5743704979839069563839512692265820549527076999492449313315050835
-6912957806010502767906158581762725597848101883591337724546592587
diff --git a/linux-daemon/linux-daemon.zip b/linux-daemon/linux-daemon.zip
index 9db92ff..d9ac355 100644
Binary files a/linux-daemon/linux-daemon.zip and b/linux-daemon/linux-daemon.zip differ
diff --git a/linux-daemon/remote-linux-pair b/linux-daemon/remote-linux-pair
index ca80187..118e502 100755
--- a/linux-daemon/remote-linux-pair
+++ b/linux-daemon/remote-linux-pair
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
-import socket, sys, json, struct, os
+import socket, sys, json, struct, os, getpass, pwd
 
-from pprint import pprint
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
 
 def is_json(myjson):
     try:
         json_object = json.loads(myjson)
-    except ValueError, e:
+    except ValueError:
         return False
     return True
 
@@ -20,6 +21,14 @@ def get_default_gateway_linux():
 
             return socket.inet_ntoa(struct.pack("<L", int(fields[2], 16)))
 
+def get_username():
+    user = pwd.getpwuid(os.getuid()).pw_name
+    if user == "root":
+        try:
+            user = os.environ["SUDO_USER"]
+        except KeyError:
+            return getpass.getuser()
+    return user
 
 # Create a TCP/IP socket
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -32,7 +41,7 @@ s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 s.connect((str(get_default_gateway_linux()), 0))
 IP = s.getsockname()[0]
 
-print >>sys.stderr, "You are about to pair a new device to this computer.\nIf you have not done so already, please open the Remote Linux Unlocker app. You can download it here: https://play.google.com/store/apps/details?id=com.maxchehab.remotelinuxunlocker\nWhen you are ready, please type the following IP address into the required field on your device.\n\nIP Address: " + IP
+eprint("You are about to pair a new device to this computer.\nIf you have not done so already, please open the Remote Linux Unlocker app. You can download it here: https://play.google.com/store/apps/details?id=com.maxchehab.remotelinuxunlocker\nWhen you are ready, please type the following IP address into the required field on your device.\n\nIP Address: " + IP)
 sock.bind(server_address)
 
 # Listen for incoming connections
@@ -40,31 +49,32 @@ sock.listen(1)
 
 while True:
     # Wait for a connection
-    print >>sys.stderr, '\nAwaiting your response...'
+    eprint('\nAwaiting your response...')
     connection, client_address = sock.accept()
 
     try:
-        print >>sys.stderr, 'Connection received...'
+        eprint('Connection received...')
 
         # Receive the data in small chunks and retransmit it
         while True:
             data = connection.recv(256).strip()
-            print >>sys.stderr, 'Processing request...'
+            eprint('Processing request...')
             if is_json(data):
                 data = json.loads(data)
                 if data["command"] == "pair" and len(data["key"]) == 64:
-                    if os.path.exists(os.path.dirname(os.path.realpath(__file__)) + '/keys.db'):
+                    user = get_username()
+                    if os.path.exists(os.path.dirname(os.path.realpath(__file__)) + '/keys'):
                         append_write = 'a' # append if already exists
                     else:
                         append_write = 'w' # make a new file if not
-                    with open(os.path.dirname(os.path.realpath(__file__)) + '/keys.db', append_write) as file:
-                        file.write(data["key"] + "\n")
-                    connection.sendall('{"status":"success"}')
-                    print >> sys.stderr, 'Pairing was successful!'
+                    with open(os.path.dirname(os.path.realpath(__file__)) + '/keys', append_write) as file:
+                        file.write(user + " " + data["key"] + "\n")
+                    connection.sendall(b'{"status":"success","user":"' + user.encode() + b'"}')
+                    eprint('Pairing was successful!')
                     sys.exit()
 
             else:
-                print >>sys.stderr, 'Invalid request!'
+                eprint('Invalid request!')
                 sys.exit()
                 break
 
diff --git a/linux-daemon/unlocker-daemon.py b/linux-daemon/unlocker-daemon.py
old mode 100644
new mode 100755
index 28f6e4a..cd0173a
--- a/linux-daemon/unlocker-daemon.py
+++ b/linux-daemon/unlocker-daemon.py
@@ -1,44 +1,60 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import socket, sys, json, subprocess, os
-from pprint import pprint
+
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
 
 def is_json(myjson):
     try:
         json_object = json.loads(myjson)
-    except ValueError, e:
+    except ValueError:
         return False
     return True
 
+def get_user_from_key(key):
+    with open(os.path.dirname(os.path.realpath(__file__)) + '/keys') as file:
+        for line in file:
+            line = line.strip().split(' ')
+            if line[1] == key:
+                return line[0]
+                break
+    return ""
 
-def is_locked():
-    users = [i.split(':') for i in open('/etc/shadow').readlines()]
-    user = [i[0] for i in users if i[1] not in ('!', '*')][0]
+def authenticate_key(key):
+    # with open(os.path.dirname(os.path.realpath(__file__)) + '/keys') as file:
+    #     for line in file:
+    #         if line.strip().split(' ')[1] == key:
+    #             return True
+    #             break
+    # return False
+    return get_user_from_key(key) != ""
 
-    commands = 'su ' + user + ' -c -- "gdbus call -e -d com.canonical.Unity -o /com/canonical/Unity/Session -m com.canonical.Unity.Session.IsLocked"'
+def is_locked(key):
+    # users = [i.split(':') for i in open('/etc/shadow').readlines()]
+    # user = [i[0] for i in users if i[1] not in ('!', '*')][0]
+    user = get_user_from_key(key)
+    if user == "":
+        return False
+    #commands = 'su ' + user + ' -c -- "gdbus call -e -d com.canonical.Unity -o /com/canonical/Unity/Session -m com.canonical.Unity.Session.IsLocked"'
+    commands = 'su ' + user + ' -c -- "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call --print-reply /org/freedesktop/ScreenSaver org.freedesktop.ScreenSaver.GetActive"'
     p = subprocess.Popen(commands,stdout=subprocess.PIPE, shell=True)
-    if "true" in str(p.communicate()):
+    res = str(p.communicate())
+    if "true" in res:
         return True
     else:
+        # print(users)
+        print(user + "> " + res)
         return False
     return False
 
-def authenticate_key(key):
-    with open(os.path.dirname(os.path.realpath(__file__)) + '/keys.db') as file:
-        for line in file:
-            if line.strip() == key:
-                return True
-                break
-
-    return False
-
-
 # Create a TCP/IP socket
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
 # Bind the socket to the port
 server_address = ('', 61599)
-print >>sys.stderr, 'starting up on %s port %s' % server_address
+eprint('starting up on %s port %s' % server_address)
 sock.bind(server_address)
 
 # Listen for incoming connections
@@ -46,37 +62,37 @@ def authenticate_key(key):
 
 while True:
     # Wait for a connection
-    print >>sys.stderr, 'waiting for a connection'
+    eprint('waiting for a connection')
     connection, client_address = sock.accept()
 
     try:
-        print >>sys.stderr, 'connection from', client_address
+        eprint('connection from', client_address)
 
         # Receive the data in small chunks and retransmit it
         while True:
             data = connection.recv(256).strip()
-            print >>sys.stderr, 'received "%s"' % data
+            eprint('received "%s"' % data)
             if is_json(data):
                 data = json.loads(data)
                 if data["command"] == "lock" and data["key"] and authenticate_key(data["key"]):
-                    print >>sys.stderr, 'client requesting lock'
+                    eprint('client requesting lock')
                     subprocess.call(["loginctl", "lock-sessions"])
-                    connection.sendall('{"status":"success"')
+                    connection.sendall(b'{"status":"success"')
                     break
                 elif data["command"] == "unlock" and data["key"] and authenticate_key(data["key"]):
-                    print >>sys.stderr, 'client requesting unlock'
+                    eprint('client requesting unlock')
                     subprocess.call(["loginctl", "unlock-sessions"])
-                    connection.sendall('{"status":"success"')
+                    connection.sendall(b'{"status":"success"')
                     break
                 elif data["command"] == "status" and data["key"] and authenticate_key(data["key"]):
-                    print >>sys.stderr, 'client requesting echo'
-                    response = '{"status":"success","hostname":"' + socket.gethostname() +  '","isLocked":"' + str(is_locked()) + '"}';
-                    print >> sys.stderr, response
-                    connection.sendall(response)
+                    eprint('client requesting echo')
+                    response = '{"status":"success","hostname":"' + socket.gethostname() +  '","isLocked":"' + str(is_locked(data["key"])) + '"}'
+                    eprint( response)
+                    connection.sendall(response.encode("utf-8"))
                     break
 
             else:
-                print >>sys.stderr, 'no more data from', client_address
+                eprint('no more data from', client_address)
                 break
 
     finally:
diff --git a/linux-daemon/unlocker-deamon.service b/linux-daemon/unlocker-daemon.service
similarity index 100%
rename from linux-daemon/unlocker-deamon.service
rename to linux-daemon/unlocker-daemon.service