diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..df87cf9
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
\ No newline at end of file
diff --git a/.idea/kalker.iml b/.idea/kalker.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/kalker.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..e9bdc5d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/kalker.iml" filepath="$PROJECT_DIR$/.idea/kalker.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/mobile/.idea/runConfigurations.xml b/mobile/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/mobile/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/mobile/.idea/workspace.xml b/mobile/.idea/workspace.xml
index e1f2b25..3d74f9e 100644
--- a/mobile/.idea/workspace.xml
+++ b/mobile/.idea/workspace.xml
@@ -4,7 +4,12 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f715975d-940d-4ed4-9dbe-0bcb3d72e51d" name="Default Changelist" comment="" />
+    <list default="true" id="f715975d-940d-4ed4-9dbe-0bcb3d72e51d" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/android/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/variables.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/variables.gradle" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -22,6 +27,8 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
+    <property name="cidr.known.project.marker" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/android" />
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
@@ -38,14 +45,4 @@
     </task>
     <servers />
   </component>
-  <component name="WindowStateProjectService">
-    <state x="738" y="345" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1622829848954">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state x="738" y="345" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.2560.1440/2560.0.1920.1080@0.0.2560.1440" timestamp="1622829848954" />
-    <state x="1063" y="445" width="424" height="476" key="FileChooserDialogImpl" timestamp="1622829905435">
-      <screen x="0" y="0" width="2560" height="1440" />
-    </state>
-    <state x="1063" y="445" width="424" height="476" key="FileChooserDialogImpl/0.0.2560.1440/2560.0.1920.1080@0.0.2560.1440" timestamp="1622829905435" />
-  </component>
 </project>
\ No newline at end of file
diff --git a/mobile/android/.idea/misc.xml b/mobile/android/.idea/misc.xml
index 59135fb..5ad23e0 100644
--- a/mobile/android/.idea/misc.xml
+++ b/mobile/android/.idea/misc.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/mobile/android/.idea/runConfigurations.xml b/mobile/android/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/mobile/android/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 49ca1b6..6363b81 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -48,13 +48,4 @@ dependencies {
     implementation project(':capacitor-cordova-android-plugins')
 }
 
-apply from: 'capacitor.build.gradle'
-
-try {
-    def servicesJSON = file('google-services.json')
-    if (servicesJSON.text) {
-        apply plugin: 'com.google.gms.google-services'
-    }
-} catch(Exception e) {
-    logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
-}
\ No newline at end of file
+apply from: 'capacitor.build.gradle'
\ No newline at end of file
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index e4d35f1..56d9884 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -29,34 +29,5 @@
             </intent-filter>
 
         </activity>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
-        </provider>
     </application>
-
-    <!-- Permissions -->
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- Camera, Photos, input file -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!-- Geolocation API -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-feature android:name="android.hardware.location.gps" />
-    <!-- Network API -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- Navigator.getUserMedia -->
-    <!-- Video -->
-    <uses-permission android:name="android.permission.CAMERA" />
-    <!-- Audio -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
 </manifest>
diff --git a/mobile/android/app/src/main/assets/capacitor.config.json b/mobile/android/app/src/main/assets/capacitor.config.json
index 16fc575..ed5b523 100644
--- a/mobile/android/app/src/main/assets/capacitor.config.json
+++ b/mobile/android/app/src/main/assets/capacitor.config.json
@@ -9,5 +9,8 @@
     "SplashScreen": {
       "launchShowDuration": 0
     }
-  }
-}
\ No newline at end of file
+  },
+  "includePlugins": [
+      "SplashScreen"
+  ]
+}
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index fc069ba..e65e75f 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'com.google.gms:google-services:4.3.3'
+        //classpath 'com.google.gms:google-services:4.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/mobile/android/variables.gradle b/mobile/android/variables.gradle
index 42ed435..bcadd33 100644
--- a/mobile/android/variables.gradle
+++ b/mobile/android/variables.gradle
@@ -8,8 +8,6 @@ ext {
     androidxBrowserVersion =  '1.2.0'
     androidxLocalbroadcastmanagerVersion =  '1.0.0'
     androidxExifInterfaceVersion = '1.2.0'
-    firebaseMessagingVersion =  '20.1.2'
-    playServicesLocationVersion =  '17.0.0'
     junitVersion =  '4.12'
     androidxJunitVersion =  '1.1.1'
     androidxEspressoCoreVersion =  '3.2.0'
diff --git a/mobile/capacitor.config.json b/mobile/capacitor.config.json
index 16fc575..ed5b523 100644
--- a/mobile/capacitor.config.json
+++ b/mobile/capacitor.config.json
@@ -9,5 +9,8 @@
     "SplashScreen": {
       "launchShowDuration": 0
     }
-  }
-}
\ No newline at end of file
+  },
+  "includePlugins": [
+      "SplashScreen"
+  ]
+}
diff --git a/mobile/package-lock.json b/mobile/package-lock.json
index aeb0342..f196321 100644
--- a/mobile/package-lock.json
+++ b/mobile/package-lock.json
@@ -1,18 +1,18 @@
 {
   "name": "kalk_mobile",
-  "version": "1.0.1",
+  "version": "2.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "kalk_mobile",
-      "version": "1.0.1",
+      "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
         "@capacitor/android": "^2.4.5",
         "@capacitor/cli": "^2.4.5",
         "@capacitor/core": "^2.4.5",
-        "@paddim8/kalk-component": "^1.3.0"
+        "@paddim8/kalk-component": "^2.0.1"
       },
       "devDependencies": {
         "@capacitor-community/electron": "^1.3.2",
@@ -194,16 +194,16 @@
       }
     },
     "node_modules/@paddim8/kalk": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@paddim8/kalk/-/kalk-2.1.1.tgz",
-      "integrity": "sha512-lIWvZqNOjclV4yAcsYMKZuqXkP0bhml2D/2BmoyzB/JkSgIQblPa+OVjxtntekFjoY1XUnx9R0sWcIVNXBuaPA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@paddim8/kalk/-/kalk-3.0.1.tgz",
+      "integrity": "sha512-7QDYJVdIzJMSvxzFwm2dQDnrnYVzFVzTF6RhS2DwnAXotRc85NPJEy8Hti7xlTgzF5tjGqi9TN8txJ1ZILMPsw=="
     },
     "node_modules/@paddim8/kalk-component": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@paddim8/kalk-component/-/kalk-component-1.3.0.tgz",
-      "integrity": "sha512-MnDzXiOwRGdRGIGHm+nBlCDsGaVK9kMzK5RhOs3wY/wbbviSfAKiIU5uqATxtQk9aa+T3di1obz0AkoIjFs/HQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@paddim8/kalk-component/-/kalk-component-2.0.1.tgz",
+      "integrity": "sha512-ic+/Mc0lrQJJHo0BZa7qq/CFHdkLxDcQmrtAgW9iIv6/O/Ucoqw9S/XhBTJElt/YKh68881Qcd2GBVT50/Cwpg==",
       "dependencies": {
-        "@paddim8/kalk": "^2.1.0",
+        "@paddim8/kalk": "^3.0.1",
         "shadow-selection-polyfill": "^1.1.0"
       }
     },
@@ -5250,16 +5250,16 @@
       }
     },
     "@paddim8/kalk": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@paddim8/kalk/-/kalk-2.1.1.tgz",
-      "integrity": "sha512-lIWvZqNOjclV4yAcsYMKZuqXkP0bhml2D/2BmoyzB/JkSgIQblPa+OVjxtntekFjoY1XUnx9R0sWcIVNXBuaPA=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@paddim8/kalk/-/kalk-3.0.1.tgz",
+      "integrity": "sha512-7QDYJVdIzJMSvxzFwm2dQDnrnYVzFVzTF6RhS2DwnAXotRc85NPJEy8Hti7xlTgzF5tjGqi9TN8txJ1ZILMPsw=="
     },
     "@paddim8/kalk-component": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@paddim8/kalk-component/-/kalk-component-1.3.0.tgz",
-      "integrity": "sha512-MnDzXiOwRGdRGIGHm+nBlCDsGaVK9kMzK5RhOs3wY/wbbviSfAKiIU5uqATxtQk9aa+T3di1obz0AkoIjFs/HQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@paddim8/kalk-component/-/kalk-component-2.0.1.tgz",
+      "integrity": "sha512-ic+/Mc0lrQJJHo0BZa7qq/CFHdkLxDcQmrtAgW9iIv6/O/Ucoqw9S/XhBTJElt/YKh68881Qcd2GBVT50/Cwpg==",
       "requires": {
-        "@paddim8/kalk": "^2.1.0",
+        "@paddim8/kalk": "^3.0.1",
         "shadow-selection-polyfill": "^1.1.0"
       }
     },
diff --git a/mobile/remove-proprietary.sh b/mobile/remove-proprietary.sh
new file mode 100755
index 0000000..9573d64
--- /dev/null
+++ b/mobile/remove-proprietary.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+dir="./node_modules/@capacitor/android/capacitor"
+
+# remove lines related to play service/firebase dependencies
+sed -i '/playServices/d' "$dir/build.gradle"
+sed -i '/firebase/d' "$dir/build.gradle"
+
+# remove the files that rely on the proprietary services
+rm "$dir/src/main/java/com/getcapacitor/plugin/Geolocation.java"
+rm "$dir/src/main/java/com/getcapacitor/plugin/PushNotifications.java"
+rm "$dir/src/main/java/com/getcapacitor/CapacitorFirebaseMessagingService.java"
+
+# remove the references to the plugins in Bridge.java
+sed -i '/Geolocation/d' "$dir/src/main/java/com/getcapacitor/Bridge.java"
+sed -i '/PushNotifications/d' "$dir/src/main/java/com/getcapacitor/Bridge.java"
+
+# remove unecessary permissions and now redundant lines from manifest
+sed -i '/WAKE_LOCK/d' "$dir/src/main/AndroidManifest.xml"
+sed -i '/RECEIVE_BOOT_COMPLETED/d' "$dir/src/main/AndroidManifest.xml"
+i=$(grep -n "firebase_messaging_auto_init_enabled" "$dir/src/main/AndroidManifest.xml" | cut -d : -f 1)
+sed -i "$i,$(($i+12))d" "$dir/src/main/AndroidManifest.xml"