diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj
index f771d9b..74e2872 100644
--- a/WOKA.xcodeproj/project.pbxproj
+++ b/WOKA.xcodeproj/project.pbxproj
@@ -1479,8 +1479,8 @@
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1517,8 +1517,8 @@
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/WOKA/Main/Delegate/AppDelegate.swift b/WOKA/Main/Delegate/AppDelegate.swift
index b0818b2..7674fb1 100644
--- a/WOKA/Main/Delegate/AppDelegate.swift
+++ b/WOKA/Main/Delegate/AppDelegate.swift
@@ -38,6 +38,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return true
     }
         
+    
+//    func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
+//        return .portrait
+//    }
+    
     // MARK: UISceneSession Lifecycle
 
     func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
diff --git a/WOKA/Theme/Base.lproj/Theme.storyboard b/WOKA/Theme/Base.lproj/Theme.storyboard
index 744fbc8..bac8c4b 100644
--- a/WOKA/Theme/Base.lproj/Theme.storyboard
+++ b/WOKA/Theme/Base.lproj/Theme.storyboard
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <device id="retina6_72" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
@@ -22,43 +22,43 @@
             <objects>
                 <viewController storyboardIdentifier="ThemeOneVC" id="VXi-XB-hOy" customClass="ThemeOneVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="UEh-jl-IQp">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jdZ-WQ-xcr">
-                                <rect key="frame" x="0.0" y="0.0" width="393" height="532.66666666666663"/>
+                                <rect key="frame" x="0.0" y="0.0" width="430" height="582.66666666666663"/>
                                 <color key="backgroundColor" red="0.34901960780000002" green="0.81568627449999997" blue="0.99607843139999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Star" translatesAutoresizingMaskIntoConstraints="NO" id="s5k-HV-Zkc">
-                                <rect key="frame" x="101" y="74.333333333333329" width="40" height="40"/>
+                                <rect key="frame" x="101" y="76.666666666666671" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="40" id="T5w-0w-VHk"/>
                                     <constraint firstAttribute="height" constant="40" id="ijF-vI-jb7"/>
                                 </constraints>
                             </imageView>
                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Star" translatesAutoresizingMaskIntoConstraints="NO" id="XTn-ID-1Yb">
-                                <rect key="frame" x="20" y="225" width="30" height="30"/>
+                                <rect key="frame" x="20" y="229.33333333333334" width="30" height="30.000000000000028"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="Kjd-Nt-Asn"/>
                                     <constraint firstAttribute="width" secondItem="XTn-ID-1Yb" secondAttribute="height" multiplier="1:1" id="WO6-Ed-Yfd"/>
                                 </constraints>
                             </imageView>
                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Star" translatesAutoresizingMaskIntoConstraints="NO" id="U1W-OZ-7vR">
-                                <rect key="frame" x="184" y="377" width="25" height="25"/>
+                                <rect key="frame" x="202.66666666666666" y="413.66666666666669" width="25" height="25"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="U1W-OZ-7vR" secondAttribute="height" multiplier="1:1" id="PvJ-97-UfQ"/>
                                     <constraint firstAttribute="height" constant="25" id="vTp-0T-OjL"/>
                                 </constraints>
                             </imageView>
                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Star" translatesAutoresizingMaskIntoConstraints="NO" id="t3E-Cj-I2d">
-                                <rect key="frame" x="268" y="415.66666666666669" width="20" height="20"/>
+                                <rect key="frame" x="296" y="452.66666666666669" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="8f0-Kf-opP"/>
                                     <constraint firstAttribute="width" secondItem="t3E-Cj-I2d" secondAttribute="height" multiplier="1:1" id="bWZ-b9-ckU"/>
                                 </constraints>
                             </imageView>
                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Moon" translatesAutoresizingMaskIntoConstraints="NO" id="Jbf-Kl-35X">
-                                <rect key="frame" x="293" y="175" width="70" height="100"/>
+                                <rect key="frame" x="330" y="179.33333333333334" width="70" height="100.00000000000003"/>
                                 <color key="tintColor" red="0.59309977107359713" green="0.60037522820196854" blue="0.93852707153973092" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="100" id="2nN-YX-rc0"/>
@@ -66,7 +66,7 @@
                                 </constraints>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rkf-MW-5IL">
-                                <rect key="frame" x="10" y="56.333333333333343" width="76" height="76"/>
+                                <rect key="frame" x="10" y="58.666666666666657" width="76" height="76"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="rkf-MW-5IL" secondAttribute="height" multiplier="1:1" id="O3J-OU-t73"/>
                                 </constraints>
@@ -74,13 +74,13 @@
                                 <state key="normal" image="FM"/>
                             </button>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="sf9-me-n7i" userLabel="Avatar Stack">
-                                <rect key="frame" x="109" y="64" width="175" height="101"/>
+                                <rect key="frame" x="127.66666666666669" y="63.999999999999993" width="175" height="105.33333333333331"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Boy" translatesAutoresizingMaskIntoConstraints="NO" id="o2x-QJ-V9A">
-                                        <rect key="frame" x="62.666666666666657" y="0.0" width="49.666666666666657" height="47.666666666666664"/>
+                                        <rect key="frame" x="62.666666666666671" y="0.0" width="49.666666666666671" height="52"/>
                                     </imageView>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="Pal-S1-L45">
-                                        <rect key="frame" x="35.666666666666664" y="52.666666666666671" width="103.66666666666669" height="24"/>
+                                        <rect key="frame" x="35.666666666666664" y="57" width="103.66666666666669" height="24"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hello" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YmK-3m-WeD" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="50.333333333333336" height="24"/>
@@ -90,7 +90,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tQN-s8-9SK">
-                                                <rect key="frame" x="53.333333333333343" y="0.0" width="50.333333333333343" height="24"/>
+                                                <rect key="frame" x="53.333333333333314" y="0.0" width="50.333333333333343" height="24"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -99,7 +99,7 @@
                                         </subviews>
                                     </stackView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Welcome to WOKALAND" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dnl-w0-q5K" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="81.666666666666657" width="175" height="19.333333333333329"/>
+                                        <rect key="frame" x="0.0" y="86" width="175" height="19.333333333333329"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -107,24 +107,24 @@
                                 </subviews>
                             </stackView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xgH-t8-LiX" userLabel="GrassCloudView">
-                                <rect key="frame" x="0.0" y="392" width="393" height="460"/>
+                                <rect key="frame" x="0.0" y="428.66666666666674" width="430" height="503.33333333333326"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Cloud1" translatesAutoresizingMaskIntoConstraints="NO" id="hnb-h6-Rgs" userLabel="LightCloud">
-                                        <rect key="frame" x="-183.66666666666666" y="-50" width="760.33333333333337" height="180"/>
+                                        <rect key="frame" x="-165" y="-50" width="760" height="180"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="760" id="R0a-7m-o4f"/>
                                             <constraint firstAttribute="height" constant="180" id="laa-aE-ve4"/>
                                         </constraints>
                                     </imageView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Cloud2" translatesAutoresizingMaskIntoConstraints="NO" id="lMA-vm-xCk" userLabel="DenseCloud">
-                                        <rect key="frame" x="-183.66666666666666" y="13" width="760.33333333333337" height="154"/>
+                                        <rect key="frame" x="-165" y="13" width="760" height="154"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="154" id="0Dz-kQ-2bb"/>
                                             <constraint firstAttribute="width" constant="760" id="teJ-X3-Yjs"/>
                                         </constraints>
                                     </imageView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HomeGrassDay" translatesAutoresizingMaskIntoConstraints="NO" id="bNd-CB-wx1">
-                                        <rect key="frame" x="0.0" y="0.0" width="393" height="460"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="430" height="503.33333333333331"/>
                                     </imageView>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -140,20 +140,20 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kzE-UE-7KK">
-                                <rect key="frame" x="98.666666666666671" y="195" width="195.66666666666663" height="180.66666666666663"/>
+                                <rect key="frame" x="108" y="199.33333333333337" width="214" height="197.66666666666663"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LiveTVBaloon" translatesAutoresizingMaskIntoConstraints="NO" id="bJW-hf-OzK">
-                                        <rect key="frame" x="35.666666666666671" y="0.0" width="128.33333333333331" height="75"/>
+                                        <rect key="frame" x="39" y="0.0" width="140" height="75"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="75" id="kT7-18-wB5"/>
                                         </constraints>
                                     </imageView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="edI-4n-4AY">
-                                        <rect key="frame" x="14.333333333333329" y="58.333333333333336" width="167" height="114.33333333333331"/>
+                                        <rect key="frame" x="20.666666666666657" y="64.666666666666657" width="182.66666666666666" height="125"/>
                                         <color key="backgroundColor" systemColor="systemGreenColor"/>
                                     </view>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LiveTVBorder" translatesAutoresizingMaskIntoConstraints="NO" id="FTD-lO-6ko">
-                                        <rect key="frame" x="0.0" y="20" width="195.66666666666666" height="160.66666666666666"/>
+                                        <rect key="frame" x="0.0" y="20" width="214" height="177.66666666666666"/>
                                     </imageView>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -161,20 +161,18 @@
                                     <constraint firstItem="bJW-hf-OzK" firstAttribute="top" secondItem="kzE-UE-7KK" secondAttribute="top" id="7St-kz-z7L"/>
                                     <constraint firstItem="FTD-lO-6ko" firstAttribute="top" secondItem="kzE-UE-7KK" secondAttribute="top" constant="20" id="8DV-Q9-qId"/>
                                     <constraint firstItem="bJW-hf-OzK" firstAttribute="centerX" secondItem="kzE-UE-7KK" secondAttribute="centerX" constant="2" id="8ck-mr-gXI"/>
-                                    <constraint firstItem="edI-4n-4AY" firstAttribute="height" secondItem="kzE-UE-7KK" secondAttribute="height" multiplier="0.631579" id="8d2-p4-NX7"/>
                                     <constraint firstAttribute="width" secondItem="kzE-UE-7KK" secondAttribute="height" multiplier="6.5:6" id="DFn-uz-LeD"/>
-                                    <constraint firstItem="edI-4n-4AY" firstAttribute="width" secondItem="kzE-UE-7KK" secondAttribute="width" multiplier="0.854369" id="In1-Gv-Td3"/>
                                     <constraint firstItem="FTD-lO-6ko" firstAttribute="leading" secondItem="kzE-UE-7KK" secondAttribute="leading" id="MjF-Bf-i0B"/>
                                     <constraint firstItem="bJW-hf-OzK" firstAttribute="width" secondItem="kzE-UE-7KK" secondAttribute="width" multiplier="0.65534" id="RPK-qk-aYn"/>
                                     <constraint firstItem="bJW-hf-OzK" firstAttribute="top" secondItem="kzE-UE-7KK" secondAttribute="top" id="TfL-do-87D"/>
-                                    <constraint firstItem="edI-4n-4AY" firstAttribute="centerX" secondItem="kzE-UE-7KK" secondAttribute="centerX" id="elb-rG-Jom"/>
+                                    <constraint firstItem="edI-4n-4AY" firstAttribute="centerX" secondItem="kzE-UE-7KK" secondAttribute="centerX" constant="5" id="elb-rG-Jom"/>
                                     <constraint firstAttribute="bottom" secondItem="FTD-lO-6ko" secondAttribute="bottom" id="hxq-jC-EkJ"/>
                                     <constraint firstAttribute="bottom" secondItem="edI-4n-4AY" secondAttribute="bottom" constant="8" id="qG7-HL-AwT"/>
                                     <constraint firstAttribute="trailing" secondItem="FTD-lO-6ko" secondAttribute="trailing" id="seE-xo-G4v"/>
                                 </constraints>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Qfe-q3-rbY">
-                                <rect key="frame" x="348" y="64" width="40" height="40"/>
+                                <rect key="frame" x="385" y="64" width="40" height="40"/>
                                 <subviews>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b3F-hf-9c8">
                                         <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
@@ -204,16 +202,16 @@
                                 </subviews>
                             </stackView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ppi-HI-rj1" userLabel="IconView">
-                                <rect key="frame" x="0.0" y="395.66666666666674" width="393" height="456.33333333333326"/>
+                                <rect key="frame" x="0.0" y="432.66666666666674" width="430" height="499.33333333333326"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ehe-Th-asW" userLabel="Shop">
-                                        <rect key="frame" x="288" y="0.0" width="95" height="95"/>
+                                        <rect key="frame" x="316" y="0.0" width="104" height="104"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Shop" translatesAutoresizingMaskIntoConstraints="NO" id="z9r-YX-CUk">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="79"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="104" height="88"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SHOP" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a1C-yY-cjD" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="80" width="95" height="15"/>
+                                                <rect key="frame" x="0.0" y="88.999999999999943" width="104" height="15"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="15" id="QSf-0H-Fwk"/>
                                                 </constraints>
@@ -227,13 +225,13 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="lRy-nX-Xia" userLabel="LiveTV">
-                                        <rect key="frame" x="149" y="52.333333333333314" width="95" height="95"/>
+                                        <rect key="frame" x="163" y="61.333333333333314" width="104" height="104"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LiveTV" translatesAutoresizingMaskIntoConstraints="NO" id="LoO-Qh-9ci">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="79"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="104" height="88"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LIVE TV" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="arX-6A-JO0" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="80" width="95" height="15"/>
+                                                <rect key="frame" x="0.0" y="89" width="104" height="15"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="15" id="Ff3-ym-Dew"/>
                                                 </constraints>
@@ -247,13 +245,13 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="Sp0-yh-bdj" userLabel="WebSeries">
-                                        <rect key="frame" x="10" y="77.333333333333314" width="95" height="95"/>
+                                        <rect key="frame" x="10" y="86.333333333333314" width="104" height="104"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WebSeries" translatesAutoresizingMaskIntoConstraints="NO" id="LGm-UX-yVh">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="79"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="104" height="88"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WEB SERIES" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zmu-oJ-DFc" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="80" width="95" height="15"/>
+                                                <rect key="frame" x="0.0" y="89" width="104" height="15"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="15" id="tmo-ie-b2U"/>
                                                 </constraints>
@@ -267,13 +265,13 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="r88-JP-phS" userLabel="Games">
-                                        <rect key="frame" x="298" y="134.99999999999994" width="95" height="95"/>
+                                        <rect key="frame" x="326" y="143.99999999999994" width="104" height="104"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Games" translatesAutoresizingMaskIntoConstraints="NO" id="rhc-kY-sTl">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="79"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="104" height="88"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GAMES" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="blr-Es-vfw" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="80" width="95" height="15"/>
+                                                <rect key="frame" x="0.0" y="89" width="104" height="15"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="15" id="cfa-zV-qLo"/>
                                                 </constraints>
@@ -287,13 +285,13 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="JHO-R6-WGZ" userLabel="Audio Books">
-                                        <rect key="frame" x="169.33333333333334" y="202.33333333333331" width="114.33333333333334" height="95.333333333333314"/>
+                                        <rect key="frame" x="182.66666666666666" y="220.33333333333331" width="124.66666666666666" height="104"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AudioBooks" translatesAutoresizingMaskIntoConstraints="NO" id="za2-oW-KjU">
-                                                <rect key="frame" x="0.0" y="0.0" width="114.33333333333333" height="79.333333333333329"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="124.66666666666667" height="88"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AUDIO BOOKS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="Y9F-E4-lgm" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="80.333333333333371" width="114.33333333333333" height="15"/>
+                                                <rect key="frame" x="0.0" y="89" width="124.66666666666667" height="15"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="15" id="978-3e-GXx"/>
                                                 </constraints>
@@ -307,13 +305,13 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="9fz-vc-Ufb" userLabel="Karaoke">
-                                        <rect key="frame" x="14.333333333333336" y="192.33333333333331" width="95" height="95.333333333333314"/>
+                                        <rect key="frame" x="18.666666666666671" y="210.33333333333331" width="104" height="104"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Karaoke" translatesAutoresizingMaskIntoConstraints="NO" id="DWF-Lu-F24">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="79.333333333333329"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="104" height="88"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KARAOKE" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yyo-6X-Jk4" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="80.333333333333371" width="95" height="15"/>
+                                                <rect key="frame" x="0.0" y="89" width="104" height="15"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="15" id="Z4M-G5-Rob"/>
                                                 </constraints>
@@ -350,13 +348,13 @@
                                 </constraints>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="-2" translatesAutoresizingMaskIntoConstraints="NO" id="LYo-Uy-0nM" userLabel="More">
-                                <rect key="frame" x="162.66666666666666" y="758" width="67.666666666666657" height="45"/>
+                                <rect key="frame" x="181.33333333333334" y="838" width="67.333333333333343" height="45"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BottomArrow" translatesAutoresizingMaskIntoConstraints="NO" id="rdd-P1-Vk7">
-                                        <rect key="frame" x="0.0" y="0.0" width="67.666666666666671" height="32.333333333333336"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="67.333333333333329" height="32.333333333333336"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="MORE" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4pq-lE-hJz" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="30.333333333333375" width="67.666666666666671" height="14.666666666666668"/>
+                                        <rect key="frame" x="0.0" y="30.333333333333375" width="67.333333333333329" height="14.666666666666668"/>
                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="12"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
@@ -380,6 +378,7 @@
                             <constraint firstItem="jdZ-WQ-xcr" firstAttribute="leading" secondItem="vdl-cu-G32" secondAttribute="leading" id="5lp-Gk-fkY"/>
                             <constraint firstItem="s5k-HV-Zkc" firstAttribute="leading" secondItem="rkf-MW-5IL" secondAttribute="trailing" constant="15" id="6G7-em-SiG"/>
                             <constraint firstItem="Qfe-q3-rbY" firstAttribute="top" secondItem="vdl-cu-G32" secondAttribute="top" constant="5" id="6TP-Kg-skA"/>
+                            <constraint firstItem="edI-4n-4AY" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.13412" id="9la-bJ-w4R"/>
                             <constraint firstAttribute="bottom" secondItem="ppi-HI-rj1" secondAttribute="bottom" id="Ahn-Nf-O3r"/>
                             <constraint firstItem="rkf-MW-5IL" firstAttribute="leading" secondItem="vdl-cu-G32" secondAttribute="leading" constant="10" id="B4I-l7-DMO"/>
                             <constraint firstItem="xgH-t8-LiX" firstAttribute="top" secondItem="U1W-OZ-7vR" secondAttribute="bottom" constant="-10" id="CIy-vs-vwp"/>
@@ -406,6 +405,7 @@
                             <constraint firstItem="kzE-UE-7KK" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.212054" id="s5Y-TI-1sZ"/>
                             <constraint firstItem="ppi-HI-rj1" firstAttribute="height" secondItem="UEh-jl-IQp" secondAttribute="height" multiplier="0.535714" id="sLx-ty-T4s"/>
                             <constraint firstItem="sf9-me-n7i" firstAttribute="centerX" secondItem="vdl-cu-G32" secondAttribute="centerX" id="vZE-xF-UKh"/>
+                            <constraint firstItem="edI-4n-4AY" firstAttribute="width" secondItem="UEh-jl-IQp" secondAttribute="width" multiplier="0.424936" id="zBP-Cg-rTK"/>
                         </constraints>
                     </view>
                     <tabBarItem key="tabBarItem" title="HOME" image="HomeIcon" selectedImage="HomeIcon" id="4Hm-tg-Heb"/>
@@ -438,18 +438,18 @@
             <objects>
                 <viewController storyboardIdentifier="ThemeTwoVC" id="3jm-7v-5GP" customClass="ThemeTwoVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Y2R-2G-NBv">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ksi-1c-xBG">
-                                <rect key="frame" x="0.0" y="134" width="393" height="220"/>
+                                <rect key="frame" x="0.0" y="134" width="430" height="220"/>
                                 <color key="backgroundColor" systemColor="systemGreenColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="220" id="ezY-uu-Vnb"/>
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4qI-5q-8TH">
-                                <rect key="frame" x="338" y="69" width="40" height="40"/>
+                                <rect key="frame" x="375" y="69" width="40" height="40"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="4qI-5q-8TH" secondAttribute="height" multiplier="1:1" id="HP0-u8-WP8"/>
                                     <constraint firstAttribute="height" constant="40" id="pa1-no-jcD"/>
@@ -506,22 +506,22 @@
                                 </subviews>
                             </stackView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BottomFrame" translatesAutoresizingMaskIntoConstraints="NO" id="1fD-0F-KMn">
-                                <rect key="frame" x="0.0" y="459" width="393" height="463"/>
+                                <rect key="frame" x="0.0" y="459" width="430" height="543"/>
                             </imageView>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wIw-DO-ba0">
-                                <rect key="frame" x="0.0" y="359" width="393" height="493"/>
+                                <rect key="frame" x="0.0" y="359" width="430" height="573"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="1iA-oh-toI">
-                                        <rect key="frame" x="0.0" y="0.0" width="393" height="184"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="430" height="184"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Explore WOKA" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cla-Q5-K2m" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="10" y="10" width="373" height="24"/>
+                                                <rect key="frame" x="10" y="10" width="410" height="24"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="4rq-xX-XRh">
-                                                <rect key="frame" x="10" y="44" width="373" height="140"/>
+                                                <rect key="frame" x="10" y="44" width="410" height="140"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="140" id="82w-Zb-27Q"/>
@@ -585,7 +585,7 @@
             <objects>
                 <viewController storyboardIdentifier="PlayerVC" id="gNO-Lg-5q3" customClass="PlayerVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Rgf-VB-8Sg">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <viewLayoutGuide key="safeArea" id="2gp-j2-aWC"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
diff --git a/WOKA/Theme/Controller/PlayerVC.swift b/WOKA/Theme/Controller/PlayerVC.swift
index 916e380..d220063 100644
--- a/WOKA/Theme/Controller/PlayerVC.swift
+++ b/WOKA/Theme/Controller/PlayerVC.swift
@@ -31,7 +31,7 @@ class PlayerVC: JWPlayerViewController ,JWPlayerViewControllerDelegate{
         self.delegate = self
 //
 
-//        self.forceFullScreenOnLandscape = true
+        self.forceLandscapeOnFullScreen = true
 //        self.playerView.videoGravity = .resizeAspectFill
         
         
@@ -53,6 +53,9 @@ class PlayerVC: JWPlayerViewController ,JWPlayerViewControllerDelegate{
         NotificationCenter.default.addObserver(self, selector: #selector(applicationDidBecomeActive), name: UIApplication.willEnterForegroundNotification, object: nil)
 
     }
+    
+
+    
     @objc func applicationDidBecomeActive() {
         self.setDeviceOrientation(orientation: .landscapeRight)
     }
@@ -152,6 +155,7 @@ extension PlayerVC{
     
     func playerViewControllerWillGoFullScreen(_ controller: JWPlayerViewController) -> JWFullScreenViewController? {
 //        controller.shouldEnterFullScreen = false
+        player.stop()
         controller.dismiss(animated: false) {
             self.setDeviceOrientation(orientation: .portrait)
         }
diff --git a/WOKA/Theme/Controller/ThemeOneVC.swift b/WOKA/Theme/Controller/ThemeOneVC.swift
index 82d1ede..7837093 100644
--- a/WOKA/Theme/Controller/ThemeOneVC.swift
+++ b/WOKA/Theme/Controller/ThemeOneVC.swift
@@ -40,6 +40,9 @@ class ThemeOneVC: UIViewController {
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: K.NotificationCenterReloads.reloadTheme), object: nil)
     }    
     
+    override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
+        return UIInterfaceOrientation.landscapeRight
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         vm.vc = self
diff --git a/WOKA/Theme/ViewModel/ThemeOneVM.swift b/WOKA/Theme/ViewModel/ThemeOneVM.swift
index 7ecda3f..1cfa692 100644
--- a/WOKA/Theme/ViewModel/ThemeOneVM.swift
+++ b/WOKA/Theme/ViewModel/ThemeOneVM.swift
@@ -35,7 +35,7 @@ class ThemeOneVM{
         setData()
         setupAvPlayer()
         avPlayer.play()
-        avPlayer.isMuted = true
+        avPlayer.volume = 0
 //        do{
 //            let item = try JWPlayerItemBuilder()
 //                .file(URL(string:self.liveStreamURL)!)
@@ -259,6 +259,7 @@ class ThemeOneVM{
     
     func startLiveStream(){
         avPlayer.play()
+        avPlayer.volume = 0
     }
     
     func stopLiveStream(){