diff --git a/mobile/.idea/assetWizardSettings.xml b/mobile/.idea/assetWizardSettings.xml
index ac10bc1..a0b1f7f 100644
--- a/mobile/.idea/assetWizardSettings.xml
+++ b/mobile/.idea/assetWizardSettings.xml
@@ -62,6 +62,18 @@
                                 <PersistentState>
                                   <option name="children">
                                     <map>
+                                      <entry key="backgroundImage">
+                                        <value>
+                                          <PersistentState>
+                                            <option name="values">
+                                              <map>
+                                                <entry key="imagePath" value="$PROJECT_DIR$/app/src/main/res/drawable/black.png" />
+                                                <entry key="scalingPercent" value="172" />
+                                              </map>
+                                            </option>
+                                          </PersistentState>
+                                        </value>
+                                      </entry>
                                       <entry key="foregroundClipArt">
                                         <value>
                                           <PersistentState>
diff --git a/mobile/app/src/main/java/com/odweta/solon/Launch.kt b/mobile/app/src/main/java/com/odweta/solon/Launch.kt
index be0c8bc..f4c9bf7 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Launch.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Launch.kt
@@ -149,27 +149,30 @@ private suspend fun launchPhase1(ctx: Context) {
             }
 
             // get the JSON data
-            val timeTableJSON = Network.getTimeTableJSON()
-
-            // try to save them into a file for later use
-            timeTableAvailOffline =
-                Util.saveStringToFile(timeTableFilePath, timeTableJSON)
-
-            // parse the data
-            week = Parsing.parseTimeTableJSON(timeTableJSON)
+            var timeTableJSON = Network.getTimeTableJSON()
+            if (timeTableJSON == """{"error": "network"}""") {
+                timeTableJSON = Util.fileToString(timeTableFilePath)
+            }
 
             // fetch and parse marks
             marksJSON = Network.getMarksJSON()
+            if (marksJSON == """{"error": "network"}""") {
+                marksJSON = Util.fileToString(marksFilePath)
+            }
 
+            timeTableAvailOffline =
+                Util.saveStringToFile(timeTableFilePath, timeTableJSON)
             marksAvailOffline =
                 Util.saveStringToFile(marksFilePath, marksJSON)
 
+            // parse the data
+            week = Parsing.parseTimeTableJSON(timeTableJSON)
             marks = Parsing.parseMarksJSON(marksJSON)
 
             // set the settings
             if (Util.fileExists(settingsDataFilePath) && !Util.fileIsEmpty(settingsDataFilePath)) {
                 settings = Util.stringToSettingsData(Util.fileToString(settingsDataFilePath))
-            } // else load the default settigns
+            } // else load the default settings
 
             // continue to launch phase 2
             done = true
diff --git a/mobile/app/src/main/launcher-playstore.png b/mobile/app/src/main/launcher-playstore.png
index bfec516..146aa5b 100644
Binary files a/mobile/app/src/main/launcher-playstore.png and b/mobile/app/src/main/launcher-playstore.png differ
diff --git a/mobile/app/src/main/res/drawable/black.png b/mobile/app/src/main/res/drawable/black.png
new file mode 100644
index 0000000..1431063
Binary files /dev/null and b/mobile/app/src/main/res/drawable/black.png differ
diff --git a/mobile/app/src/main/res/drawable/launcher_background.xml b/mobile/app/src/main/res/drawable/launcher_background.xml
index 4b96658..ca3826a 100644
--- a/mobile/app/src/main/res/drawable/launcher_background.xml
+++ b/mobile/app/src/main/res/drawable/launcher_background.xml
@@ -1,53 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="108dp"
     android:width="108dp"
     android:viewportHeight="108"
-    android:viewportWidth="108">
-
-    <!-- Background Color -->
-    <path android:fillColor="#000000"
-    android:pathData="M0,0h108v108h-108z"/>
-
-    <!-- Vertical Grid Lines -->
-    <path android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <!-- Repeat the lines for remaining grid -->
-
-    <!-- Horizontal Grid Lines -->
-    <path android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <!-- Repeat the lines for remaining grid -->
-
-    <!-- Additional Grid Lines within the Central Area -->
-    <path android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <!-- Repeat similar paths for the remaining inner lines -->
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>
diff --git a/mobile/app/src/main/res/drawable/solon_500_yellow.png b/mobile/app/src/main/res/drawable/solon_500_yellow.png
index cd38692..cf03455 100644
Binary files a/mobile/app/src/main/res/drawable/solon_500_yellow.png and b/mobile/app/src/main/res/drawable/solon_500_yellow.png differ
diff --git a/mobile/app/src/main/res/drawable/solon_500_yellow_old.png b/mobile/app/src/main/res/drawable/solon_500_yellow_old.png
new file mode 100644
index 0000000..cd38692
Binary files /dev/null and b/mobile/app/src/main/res/drawable/solon_500_yellow_old.png differ
diff --git a/mobile/app/src/main/res/drawable/solon_just_yellow.png b/mobile/app/src/main/res/drawable/solon_just_yellow.png
index b7974e9..cf03455 100644
Binary files a/mobile/app/src/main/res/drawable/solon_just_yellow.png and b/mobile/app/src/main/res/drawable/solon_just_yellow.png differ
diff --git a/mobile/app/src/main/res/drawable/solon_just_yellow_old.png b/mobile/app/src/main/res/drawable/solon_just_yellow_old.png
new file mode 100644
index 0000000..b7974e9
Binary files /dev/null and b/mobile/app/src/main/res/drawable/solon_just_yellow_old.png differ
diff --git a/mobile/app/src/main/res/drawable/solon_new_logo.png b/mobile/app/src/main/res/drawable/solon_new_logo.png
new file mode 100644
index 0000000..cf03455
Binary files /dev/null and b/mobile/app/src/main/res/drawable/solon_new_logo.png differ
diff --git a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml
index 36420df..e85c285 100644
--- a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml
+++ b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/launcher_background"/>
+    <background android:drawable="@mipmap/launcher_background"/>
     <foreground android:drawable="@mipmap/launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml
index 36420df..e85c285 100644
--- a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml
+++ b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/launcher_background"/>
+    <background android:drawable="@mipmap/launcher_background"/>
     <foreground android:drawable="@mipmap/launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher.webp
index 96d7c27..b26d325 100644
Binary files a/mobile/app/src/main/res/mipmap-hdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-hdpi/launcher.webp differ
diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp
index 9375747..cc3140d 100644
Binary files a/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp differ
diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp
index 4a4bbdf..9a43594 100644
Binary files a/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp differ
diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher.webp
index aebd188..08618de 100644
Binary files a/mobile/app/src/main/res/mipmap-mdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-mdpi/launcher.webp differ
diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp
index 0fbd31e..04ffdb9 100644
Binary files a/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp differ
diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp
index b47bae9..3989f68 100644
Binary files a/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp
index 66bd868..482bef5 100644
Binary files a/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp
index b1390ae..e480e1d 100644
Binary files a/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp
index 861f088..4e9495b 100644
Binary files a/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp
index 727c2a7..1e7802d 100644
Binary files a/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp
index 5f83104..8ec7548 100644
Binary files a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp
index 474bf90..56cfcca 100644
Binary files a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp
index f146953..bfadc1a 100644
Binary files a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp
index 663a18d..2545e9f 100644
Binary files a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp differ
diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp
index 80dc31f..d233d9e 100644
Binary files a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp differ