diff --git a/client/Nightr/.gitignore b/client/Nightr/.gitignore
index 96b561c..f34f1fd 100644
--- a/client/Nightr/.gitignore
+++ b/client/Nightr/.gitignore
@@ -2,7 +2,7 @@
 hooks/
 node_modules/
 platforms/
-App_Resources/
+App_Resources/iOS/
 
 # NativeScript Template
 *.js.map
diff --git a/client/Nightr/App_Resources/Android/app.gradle b/client/Nightr/App_Resources/Android/app.gradle
new file mode 100644
index 0000000..bb48421
--- /dev/null
+++ b/client/Nightr/App_Resources/Android/app.gradle
@@ -0,0 +1,20 @@
+// Add your native dependencies here:
+
+// Uncomment to add recyclerview-v7 dependency
+//dependencies {
+//	implementation 'com.android.support:recyclerview-v7:+'
+//}
+
+// If you want to add something to be applied before applying plugins' include.gradle files
+// e.g. project.ext.googlePlayServicesVersion = "15.0.1"
+// create a file named before-plugins.gradle in the current directory and place it there
+
+android {
+  defaultConfig {
+    minSdkVersion 17
+    generatedDensities = []
+  }
+  aaptOptions {
+    additionalParameters "--no-version-vectors"
+  }
+}
diff --git a/client/Nightr/App_Resources/Android/src/main/AndroidManifest.xml b/client/Nightr/App_Resources/Android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..1bd6826
--- /dev/null
+++ b/client/Nightr/App_Resources/Android/src/main/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="__PACKAGE__"
+	android:versionCode="1"
+	android:versionName="1.0">
+
+	<supports-screens
+		android:smallScreens="true"
+		android:normalScreens="true"
+		android:largeScreens="true"
+		android:xlargeScreens="true"/>
+
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
+
+	<application
+		android:name="com.tns.NativeScriptApplication"
+		android:allowBackup="true"
+		android:icon="@drawable/icon"
+		android:label="@string/app_name"
+		android:theme="@style/AppTheme">
+
+		<activity
+			android:name="com.tns.NativeScriptActivity"
+			android:label="@string/title_activity_kimera"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
+			android:theme="@style/LaunchScreenTheme">
+
+			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
+
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+		<activity android:name="com.tns.ErrorReportActivity"/>
+	</application>
+</manifest>
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/background.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/background.png
new file mode 100644
index 0000000..eb381c2
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/background.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/icon.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..9cde84c
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/icon.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
new file mode 100644
index 0000000..5218f4c
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/background.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/background.png
new file mode 100644
index 0000000..748b2ad
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/background.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/icon.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000..4d6a674
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/icon.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
new file mode 100644
index 0000000..b9e102a
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/logo.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/background.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/background.png
new file mode 100644
index 0000000..efeaf29
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/background.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/icon.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000..92ccc85
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/icon.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
new file mode 100644
index 0000000..6263387
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml b/client/Nightr/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
new file mode 100644
index 0000000..ada77f9
--- /dev/null
+++ b/client/Nightr/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
@@ -0,0 +1,8 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="fill">
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background" />
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/logo" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/background.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/background.png
new file mode 100644
index 0000000..612bbd0
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/background.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png
new file mode 100644
index 0000000..8bcde62
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
new file mode 100644
index 0000000..ad8ee2f
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png
new file mode 100644
index 0000000..0fa88e2
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png
new file mode 100644
index 0000000..9d81c85
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
new file mode 100644
index 0000000..6683278
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png
new file mode 100644
index 0000000..c650f64
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 0000000..9a34d0d
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
new file mode 100644
index 0000000..fa6331c
Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png differ
diff --git a/client/Nightr/App_Resources/Android/src/main/res/values-v21/colors.xml b/client/Nightr/App_Resources/Android/src/main/res/values-v21/colors.xml
new file mode 100644
index 0000000..a64641a
--- /dev/null
+++ b/client/Nightr/App_Resources/Android/src/main/res/values-v21/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="ns_accent">#3d5afe</color>
+</resources>
\ No newline at end of file
diff --git a/client/Nightr/App_Resources/Android/src/main/res/values-v21/styles.xml b/client/Nightr/App_Resources/Android/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..dac8727
--- /dev/null
+++ b/client/Nightr/App_Resources/Android/src/main/res/values-v21/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Application theme -->
+    <style name="AppTheme" parent="AppThemeBase">
+        <item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
+        <item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
+    </style>
+
+    <!-- Default style for DatePicker - in spinner mode -->
+    <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
+        <item name="android:datePickerMode">spinner</item>
+    </style>
+
+    <!-- Default style for TimePicker - in spinner mode -->
+    <style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
+        <item name="android:timePickerMode">spinner</item>
+    </style>
+
+    <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
+        <item name="android:elevation">4dp</item>
+    </style>    
+</resources>
\ No newline at end of file
diff --git a/client/Nightr/App_Resources/Android/src/main/res/values/colors.xml b/client/Nightr/App_Resources/Android/src/main/res/values/colors.xml
new file mode 100644
index 0000000..74ad882
--- /dev/null
+++ b/client/Nightr/App_Resources/Android/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ns_primary">#F5F5F5</color>
+	<color name="ns_primaryDark">#757575</color>
+	<color name="ns_accent">#33B5E5</color>
+    <color name="ns_blue">#272734</color>
+</resources>
\ No newline at end of file
diff --git a/client/Nightr/App_Resources/Android/src/main/res/values/styles.xml b/client/Nightr/App_Resources/Android/src/main/res/values/styles.xml
new file mode 100644
index 0000000..c793e6d
--- /dev/null
+++ b/client/Nightr/App_Resources/Android/src/main/res/values/styles.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- theme to use FOR launch screen-->
+    <style name="LaunchScreenThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
+
+        <item name="colorPrimary">@color/ns_primary</item>
+        <item name="colorPrimaryDark">@color/ns_primaryDark</item>
+        <item name="colorAccent">@color/ns_accent</item>
+
+        <item name="android:windowBackground">@drawable/splash_screen</item>
+        
+        <item name="android:windowActionBarOverlay">true</item>  
+        <item name="android:windowTranslucentStatus">true</item>
+
+    </style>
+
+    <style name="LaunchScreenTheme" parent="LaunchScreenThemeBase">
+    </style>
+
+    <!-- theme to use AFTER launch screen is loaded-->
+    <style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
+
+        <item name="colorPrimary">@color/ns_primary</item>
+        <item name="colorPrimaryDark">@color/ns_primaryDark</item>
+        <item name="colorAccent">@color/ns_accent</item>
+
+    </style>
+
+    <style name="AppTheme" parent="AppThemeBase">
+    </style>
+
+    <!-- theme for action-bar -->
+    <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/ns_primary</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
+
+    </style>
+
+    <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
+    </style>
+</resources>