Finalised Dark Mode

Guibe/Assets.xcassets/LoadScreen.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Screenshot 2019-05-28 at 14.09.29.png",
+      "filename" : "g.png",
       "scale" : "1x"
     },
     {
@@ -18,7 +18,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "Screenshot 2019-05-28 at 14.09.29-1.png",
+      "filename" : "g-1.png",
       "scale" : "2x"
     },
     {
@@ -34,7 +34,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "Screenshot 2019-05-28 at 14.09.29-2.png",
+      "filename" : "g-2.png",
       "scale" : "3x"
     },
     {

Guibe/Assets.xcassets/bg.imageset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "bg.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bgd.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bg-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bgd-1.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bg-2.png",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bgd-2.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Guibe/Assets.xcassets/selectorColour.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.943"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.406"
+        }
+      }
+    }
+  ]
+}

Guibe/Base.lproj/Main.storyboard

@@ -18,7 +18,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LoadScreen" translatesAutoresizingMaskIntoConstraints="NO" id="oNd-dx-rFl">
-                                <rect key="frame" x="12" y="0.0" width="402" height="896"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                         </subviews>
@@ -31,7 +31,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="6" y="21"/>
+            <point key="canvasLocation" x="5.7971014492753632" y="20.758928571428569"/>
         </scene>
         <!--3art View Controller-->
         <scene sceneID="xah-oV-ojV">
@@ -395,6 +395,8 @@ wear Guibe?</string>
                         <outlet property="nextBtn" destination="IT4-4O-Tuj" id="XSF-wz-JaY"/>
                         <outlet property="progressBar" destination="oRi-Kv-h1c" id="MiO-3W-Qe3"/>
                         <outlet property="textLabel" destination="7wZ-GO-jAW" id="oti-xh-MYP"/>
+                        <outlet property="title" destination="OJv-jh-NI8" id="Xoj-Mb-TIx"/>
+                        <outlet property="vCtrl" destination="2XH-El-mte" id="QHm-Qc-egV"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="X5p-sN-YHS" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -441,28 +443,18 @@ wear Guibe?</string>
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </mapView>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bKl-Ku-mh1" userLabel="searchView">
+                            <view opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bKl-Ku-mh1" userLabel="searchView">
-                                <rect key="frame" x="20" y="124" width="374" height="67"/>
+                                <rect key="frame" x="20" y="124" width="374" height="60"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <button opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Xt-Rr-hs1" userLabel="searchBarBg">
+                                    <searchBar contentMode="redraw" fixedFrame="YES" placeholder="Search" translatesAutoresizingMaskIntoConstraints="NO" id="dRT-vj-1ew">
-                                        <rect key="frame" x="0.0" y="8" width="374" height="59"/>
+                                        <rect key="frame" x="6" y="2" width="362" height="44"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <color key="tintColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
-                                        <state key="normal">
-                                            <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        </state>
-                                    </button>
-                                    <searchBar contentMode="redraw" fixedFrame="YES" placeholder="Search" backgroundImage="blank" translatesAutoresizingMaskIntoConstraints="NO" id="dRT-vj-1ew">
-                                        <rect key="frame" x="8" y="15" width="358" height="44"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <color key="barTintColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <color key="barTintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="yes" spellCheckingType="no" keyboardAppearance="alert" returnKeyType="go" enablesReturnKeyAutomatically="YES" smartInsertDeleteType="yes" textContentType="location"/>
                                     </searchBar>
                                 </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AjN-o6-SNx">
                                 <rect key="frame" x="106" y="54" width="288" height="53"/>
@@ -506,12 +498,12 @@ wear Guibe?</string>
                                     <action selector="headingBtnPressed:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="ZlX-6a-RgF"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
+                            <view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
                                 <rect key="frame" x="-34" y="-24" width="347" height="489"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="appLogo" translatesAutoresizingMaskIntoConstraints="NO" id="fds-28-e5l">
-                                        <rect key="frame" x="53" y="79" width="58" height="58"/>
+                                        <rect key="frame" x="52" y="69" width="72" height="72"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     </imageView>
                                     <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hHS-Ml-slu">
@@ -542,7 +534,7 @@ wear Guibe?</string>
                                         </connections>
                                     </button>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="guibeWord" translatesAutoresizingMaskIntoConstraints="NO" id="90Y-ch-grn">
-                                        <rect key="frame" x="119" y="90" width="114" height="47"/>
+                                        <rect key="frame" x="127" y="86" width="131" height="51"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     </imageView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="serparator" translatesAutoresizingMaskIntoConstraints="NO" id="2yI-Jf-HZl">
@@ -618,7 +610,7 @@ wear Guibe?</string>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BdX-f2-6nO">
+                            <view opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BdX-f2-6nO">
                                 <rect key="frame" x="79" y="812" width="234" height="40"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
@@ -637,7 +629,6 @@ wear Guibe?</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Giw-Yg-RCh">
                                 <rect key="frame" x="0.0" y="262" width="414" height="377"/>
@@ -651,6 +642,13 @@ wear Guibe?</string>
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Debug Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ng7-cY-plH">
+                                <rect key="frame" x="0.0" y="26" width="414" height="20"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="systemPurpleColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                             <view alpha="0.0" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4YN-LU-KP5">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -672,13 +670,6 @@ wear Guibe?</string>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.50644798801369861" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Debug Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ng7-cY-plH">
-                                <rect key="frame" x="0.0" y="26" width="414" height="20"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="systemPurpleColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="Ut7-03-t0b"/>
@@ -701,7 +692,6 @@ wear Guibe?</string>
                         <outlet property="persEtaLbl" destination="O4h-DM-Zqh" id="UYm-pC-87I"/>
                         <outlet property="persEtaView" destination="BdX-f2-6nO" id="4xT-MK-1za"/>
                         <outlet property="searchBar" destination="dRT-vj-1ew" id="nAa-5O-h0R"/>
-                        <outlet property="searchBarBg" destination="3Xt-Rr-hs1" id="6bL-cK-ScI"/>
                         <outlet property="searchView" destination="bKl-Ku-mh1" id="d0n-Pl-NrK"/>
                         <outlet property="startNaviBtn" destination="vzP-jK-6zt" id="pc2-d2-rNL"/>
                         <outlet property="startNaviImg" destination="zO0-ni-hEa" id="DY1-rU-X2g"/>
@@ -723,7 +713,7 @@ wear Guibe?</string>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="100" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="402-5S-nhO">
                                 <rect key="frame" x="0.0" y="71" width="414" height="771"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell" rowHeight="90" id="87K-Xo-0a5" customClass="NewTableViewCell" customModule="Guibe" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="414" height="90"/>
@@ -787,12 +777,13 @@ wear Guibe?</string>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="WeT-3n-RQD"/>
                     </view>
                     <connections>
                         <outlet property="backBtn" destination="mbK-My-hrd" id="0wI-cT-Cp5"/>
                         <outlet property="tableView" destination="402-5S-nhO" id="Qnx-3U-4Gl"/>
+                        <outlet property="vCtrl" destination="Rps-Dk-rvQ" id="Hwm-2N-Twu"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="sgH-Ai-Lho" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -949,7 +940,7 @@ wear Guibe?</string>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="iMX-Fb-tJF"/>
                     </view>
                     <connections>
@@ -1029,11 +1020,12 @@ wear Guibe?</string>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="qYW-KB-ok9"/>
                     </view>
                     <connections>
                         <outlet property="backBtn" destination="uJJ-lQ-GmO" id="RxB-gt-5Gh"/>
+                        <outlet property="vCtrl" destination="C7n-A7-fCY" id="g6V-hb-Lli"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="m3K-Fq-zFT" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1051,7 +1043,7 @@ wear Guibe?</string>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" estimatedRowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="YPD-fc-WvS">
                                 <rect key="frame" x="0.0" y="71" width="414" height="771"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="iCell" rowHeight="70" id="bUS-jX-rKe">
                                         <rect key="frame" x="0.0" y="28" width="414" height="70"/>
@@ -1086,12 +1078,13 @@ wear Guibe?</string>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="u6V-N4-N8W"/>
                     </view>
                     <connections>
                         <outlet property="backBtn" destination="sry-bt-iwt" id="26h-sk-0uT"/>
                         <outlet property="instructionsTable" destination="YPD-fc-WvS" id="v0N-yg-NsU"/>
+                        <outlet property="vCtrl" destination="ytx-yX-XHi" id="fSE-mC-Byd"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="rG2-rN-jui" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1131,7 +1124,7 @@ wear Guibe?</string>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Xmt-1u-pXu">
                                 <rect key="frame" x="20" y="89" width="374" height="719"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <string key="text">To turn on your guibe, press the button on the side of the bracelet. Your Guibe bracelet will vibrate to let you know that the connection has been successful. 
 
 Go to the main screen to search for a destination. When ready, select ‘Begin Journey’. You will feel 3 buzzes: ready, steady, go! You are now ready to start the journey and can begin walking. 
@@ -1145,15 +1138,18 @@ You are almost set, just one more instruction! When you have arrived at your des
 The casing of your device serves as a portable charger. Charge the casing via the mains and simply slip the guibe onto the casing dock to charge it wirelessly. 
 
 And that’s all you need to know to follow the vibe!</string>
+                                <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="21"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="WYN-Km-FPc"/>
                     </view>
                     <connections>
                         <outlet property="backBtn" destination="yZG-Xn-oYl" id="QWb-M7-zbk"/>
+                        <outlet property="text" destination="Xmt-1u-pXu" id="oHR-TT-dWx"/>
+                        <outlet property="vCtrl" destination="nwg-o1-bZ9" id="LZJ-dA-z5y"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="qeV-kU-gAp" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1254,7 +1250,7 @@ And that’s all you need to know to follow the vibe!</string>
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="P0U-bD-d7i"/>
                     </view>
                     <connections>
@@ -1265,6 +1261,7 @@ And that’s all you need to know to follow the vibe!</string>
                         <outlet property="b5" destination="3br-76-cai" id="oAs-3p-QPS"/>
                         <outlet property="backBtn" destination="yyl-HX-94u" id="Sbl-3X-j2K"/>
                         <outlet property="stopBtn" destination="k2T-uw-fJ5" id="prK-CB-lCk"/>
+                        <outlet property="vCtrl" destination="5kX-Rk-2ip" id="yLa-gE-K0L"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="CaX-XU-gd4" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1318,7 +1315,7 @@ And that’s all you need to know to follow the vibe!</string>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="ipt-6K-zfd"/>
                     </view>
                     <connections>
@@ -1390,7 +1387,7 @@ And that’s all you need to know to follow the vibe!</string>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="Wm0-30-s8F"/>
                     </view>
                     <connections>
@@ -1398,6 +1395,7 @@ And that’s all you need to know to follow the vibe!</string>
                         <outlet property="nextBtn" destination="hF6-5i-YIa" id="BcR-1g-dDV"/>
                         <outlet property="progressBar" destination="OwN-Ov-RpE" id="sxM-U2-TVm"/>
                         <outlet property="textLabel" destination="G5y-q3-Ci3" id="Qhb-H2-bMR"/>
+                        <outlet property="vCtrl" destination="w1b-M5-Yp6" id="Y4c-IR-YJN"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jXW-Bh-OYb" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1490,7 +1488,7 @@ And that’s all you need to know to follow the vibe!</string>
                                 <state key="normal" title="DO NOT PRESS"/>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="3YM-pK-9CO"/>
                     </view>
                     <connections>
@@ -1509,9 +1507,8 @@ And that’s all you need to know to follow the vibe!</string>
         </scene>
     </scenes>
     <resources>
-        <image name="LoadScreen" width="294.66665649414062" height="638"/>
+        <image name="LoadScreen" width="304.66665649414062" height="638"/>
         <image name="appLogo" width="341.33334350585938" height="341.33334350585938"/>
-        <image name="blank" width="314.66665649414062" height="76"/>
         <image name="buttonMedSize" width="207" height="83.333335876464844"/>
         <image name="circle" width="575.33331298828125" height="568.33331298828125"/>
         <image name="guibeWord" width="250.66667175292969" height="100"/>

Guibe/GameLearnViewController.swift

@@ -15,6 +15,8 @@ class GameLearnViewController: UIViewController, AVAudioPlayerDelegate {
     @IBOutlet weak var textLabel: UILabel!
     @IBOutlet weak var progressBar: UIProgressView!
     @IBOutlet weak var nextBtn: UIButton!
+    @IBOutlet var vCtrl: UIView!
+    @IBOutlet weak var mainTitle: UITextView!
     
     @IBAction func buttonPressed(_ sender: Any) {
         audioPlay(fName: self.fileName)
@@ -35,6 +37,10 @@ class GameLearnViewController: UIViewController, AVAudioPlayerDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        vCtrl.backgroundColor = UIColor.secondarySystemBackground
+        textLabel.textColor = UIColor.secondaryLabel
+        mainTitle.textColor = UIColor.label
+        
         textLabel.text = "Now we will learn the different haptic patterns for navigating with Guibe"
         textLabel.accessibilityLabel = "Now we will learn the different haptic patterns for navigationg with ghibe"
         mainButton.accessibilityLabel = "Play vibration"

Guibe/InstructionsViewController.swift

@@ -13,6 +13,7 @@ class InstructionsViewController: UIViewController {
 
 
     @IBOutlet weak var backBtn: UIButton!
+    @IBOutlet var vCtrl: UIView!
     
     @IBAction func backBtnPressed(_ sender: Any) {
         self.dismiss(animated: true, completion: nil)
@@ -53,6 +54,7 @@ class InstructionsViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        vCtrl.backgroundColor = UIColor.secondarySystemBackground
         
 //        easterEggBtn.accessibilityLabel = "Easter egg, do not press"
         backBtn.accessibilityLabel = "Back"

Guibe/MainViewController.swift

@@ -48,7 +48,7 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
     @IBOutlet weak var dismissBtn: UIButton!
     @IBOutlet weak var howToUseGuibeBtn: UIButton!
 //    ---------------------
-    @IBOutlet weak var searchBarBg: UIButton!
+//    @IBOutlet weak var searchBarBg: UIButton!
     @IBOutlet weak var searchView: UIView!
     @IBOutlet weak var searchBar: UISearchBar!
     @IBOutlet weak var keybDismissBtn: UIButton!
@@ -150,6 +150,9 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
         super.viewDidLoad()
         
         menuWindowView.backgroundColor = UIColor.secondarySystemBackground
+        etaView.backgroundColor = UIColor.secondarySystemBackground
+        persEtaView.backgroundColor = UIColor.secondarySystemBackground
+        
                 
         let debugVar = defaults.integer(forKey: "debug")
         
@@ -161,11 +164,11 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
         }
         
         searchBar.delegate = self
-        searchBarBg.layer.shadowColor = UIColor.black.cgColor
+//        searchBarBg.layer.shadowColor = UIColor.black.cgColor
-        searchBarBg.layer.cornerRadius = 10
+//        searchBarBg.layer.cornerRadius = 10
-        searchBarBg.layer.shadowOffset = CGSize(width: 5, height: 7)
+//        searchBarBg.layer.shadowOffset = CGSize(width: 5, height: 7)
-        searchBarBg.layer.shadowRadius = 10
+//        searchBarBg.layer.shadowRadius = 10
-        searchBarBg.layer.shadowOpacity = 0.2
+//        searchBarBg.layer.shadowOpacity = 0.2
         
         
         
@@ -231,6 +234,15 @@ class MainViewController: UIViewController, AVAudioPlayerDelegate, myProtocol {
         arrivedAtDestinationBtn.layer.shadowRadius = 50
         arrivedAtDestinationBtn.layer.shadowOpacity = 0.6
         
+        searchBar.barTintColor = UIColor.secondarySystemBackground
+        
+        searchView.layer.cornerRadius = 10
+        searchView.backgroundColor = UIColor.secondarySystemBackground
+        searchView.layer.shadowOffset = CGSize(width: 5, height: 7)
+        searchView.layer.shadowRadius = 10
+        searchView.layer.shadowOpacity = 0.2
+        
+        
         
 
         menuBtn.accessibilityLabel = "Menu"

Guibe/SecondGameLearnViewController.swift

@@ -15,6 +15,7 @@ class SecondGameLearnViewController: UIViewController, AVAudioPlayerDelegate {
     @IBOutlet weak var mainButton: UIButton!
     @IBOutlet weak var nextBtn: UIButton!
     @IBOutlet weak var progressBar: UIProgressView!
+    @IBOutlet var vCtrl: UIView!
     
     @IBAction func mainBtnPressed(_ sender: Any) {
         audioPlay(fName: self.fileName)
@@ -39,6 +40,9 @@ class SecondGameLearnViewController: UIViewController, AVAudioPlayerDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        vCtrl.backgroundColor = UIColor.secondarySystemBackground
+        textLabel.textColor = UIColor.secondaryLabel
+        
         textLabel.text = "Now we will learn the different haptic patterns for navigating with Guibe"
         textLabel.accessibilityLabel = "Now we will learn the different haptic patterns for navigationg with ghibe"
         mainButton.accessibilityLabel = "Play vibration"

Guibe/TableViewController.swift

@@ -22,6 +22,8 @@ class TableViewController: UIViewController {
     
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var backBtn: UIButton!
+    @IBOutlet var vCtrl: UIView!
+    
     
     @IBAction func backBtnPressed(_ sender: Any) {
         self.dismiss(animated: true, completion: nil)
@@ -30,6 +32,7 @@ class TableViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         backBtn.accessibilityLabel = "Back"
+        vCtrl.backgroundColor = UIColor.secondarySystemBackground
         
 //        let testData = appDelegate.navigationResults
         }

Guibe/VideoInstrictionsViewController.swift

@@ -21,6 +21,7 @@ class VideoInstrictionsViewController: UIViewController, AVAudioPlayerDelegate {
     @IBOutlet weak var b4: UIButton!
     @IBOutlet weak var b5: UIButton!
     @IBOutlet weak var stopBtn: UIButton!
+    @IBOutlet var vCtrl: UIView!
     
     
     @IBAction func b1p(_ sender: Any) {
@@ -64,6 +65,12 @@ class VideoInstrictionsViewController: UIViewController, AVAudioPlayerDelegate {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        vCtrl.backgroundColor = UIColor.secondarySystemBackground
+        b1.setTitleColor(UIColor.secondaryLabel, for: .normal)
+        b2.setTitleColor(UIColor.secondaryLabel, for: .normal)
+        b3.setTitleColor(UIColor.secondaryLabel, for: .normal)
+        b4.setTitleColor(UIColor.secondaryLabel, for: .normal)
+        b5.setTitleColor(UIColor.secondaryLabel, for: .normal)
         b1.accessibilityLabel = "connecting your ghibe"
         b2.accessibilityLabel = "wearing your ghibe"
         b3.accessibilityLabel = "ghibe language"

Guibe/WrittenInstructionsViewController.swift

@@ -40,13 +40,13 @@ class WrittenInstructionsViewController: UIViewController, UITableViewDelegate,
         else {
             cell.textLabel?.text = "Then in \(focusDistance)m, \(focusInstruction)" }
         if indexPath.row == currentStep {
-            cell.backgroundColor = .green
+            cell.backgroundColor = UIColor(named: "selectorColour")
             let txt = (cell.textLabel?.text)!
             cell.accessibilityLabel = "\(txt), current step"
         }
         else {
             cell.accessibilityLabel = cell.textLabel?.text
-            cell.backgroundColor = .white
+            cell.backgroundColor = UIColor.secondarySystemBackground
             
         }
         return cell
@@ -66,9 +66,11 @@ class WrittenInstructionsViewController: UIViewController, UITableViewDelegate,
     
     @IBOutlet weak var instructionsTable: UITableView!
     @IBOutlet weak var backBtn: UIButton!
+    @IBOutlet var vCtrl: UIView!
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        vCtrl.backgroundColor = UIColor.secondarySystemBackground
         backBtn.accessibilityLabel = "Back"
         if appDelegate.naviStarted == false {
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {

Guibe/setupTextInstructionsViewController.swift

@@ -12,6 +12,8 @@ class setupTextInstructionsViewController: UIViewController {
     
     
     @IBOutlet weak var backBtn: UIButton!
+    @IBOutlet var vCtrl: UIView!
+    @IBOutlet weak var text: UITextView!
     
     
     
@@ -22,6 +24,8 @@ class setupTextInstructionsViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         backBtn.accessibilityLabel = "Back"
+        vCtrl.backgroundColor = UIColor.secondarySystemBackground
+        text.textColor = UIColor.secondaryLabel
         // Do any additional setup after loading the view.
     }