From 1d932ecec92af5f363fd51579a0713f7bd30192c Mon Sep 17 00:00:00 2001
From: Bilal <bilal.colorbrackets@gmail.com>
Date: Tue, 20 Aug 2024 23:47:15 +0530
Subject: [PATCH] fixed theme 1 moving live tv going out of frame, fixed
 autolayout for theme 1

---
 WOKA.xcodeproj/project.pbxproj         |  16 +-
 WOKA/Home/Controller/MyListVC.swift    |   4 +-
 WOKA/Theme/Base.lproj/Theme.storyboard | 240 ++++++++++++-------------
 WOKA/Theme/Controller/PlayerVC.swift   |  17 +-
 WOKA/Theme/Controller/ThemeOneVC.swift |   6 +-
 WOKA/Theme/ViewModel/PlayerVM.swift    |   2 +-
 WOKA/Theme/ViewModel/ThemeOneVM.swift  |  80 +++++----
 7 files changed, 187 insertions(+), 178 deletions(-)

diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj
index f0c5884..72e9a9a 100644
--- a/WOKA.xcodeproj/project.pbxproj
+++ b/WOKA.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		5202AB012BDFA7900043B7BD /* EmailValidation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5202AB002BDFA7900043B7BD /* EmailValidation.swift */; };
 		520346962C64E29A00D0BD20 /* MyListViewAllCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 520346952C64E29A00D0BD20 /* MyListViewAllCell.xib */; };
 		520346972C64E29A00D0BD20 /* MyListViewAllCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520346942C64E29A00D0BD20 /* MyListViewAllCell.swift */; };
-		520B15092C74652D00C14E5E /* WOKA.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 520B15072C74652D00C14E5E /* WOKA.xcdatamodeld */; };
 		520B150B2C746A2700C14E5E /* UsernameCheckVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520B150A2C746A2700C14E5E /* UsernameCheckVC.swift */; };
 		520B150D2C746AFF00C14E5E /* UserNameDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520B150C2C746AFF00C14E5E /* UserNameDM.swift */; };
 		520CE6AD2C7483CE00974228 /* PopViewControllerGeneric.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520CE6AC2C7483CE00974228 /* PopViewControllerGeneric.swift */; };
@@ -322,6 +321,7 @@
 		9C9BEEC72BEE1BBF004ECC2F /* CollectionViewCenteredFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C9BEEC62BEE1BBF004ECC2F /* CollectionViewCenteredFlowLayout.swift */; };
 		9CA7C6C02C1093E500D73742 /* ProfileVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CA7C6BF2C1093E500D73742 /* ProfileVC.swift */; };
 		9CA7C6C22C1095B600D73742 /* ProfileVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CA7C6C12C1095B600D73742 /* ProfileVM.swift */; };
+		9CB06D2C2C7506B500B82096 /* WOKA.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9CB06D2A2C7506B500B82096 /* WOKA.xcdatamodeld */; };
 		9CB3D0852C37BA530062869D /* Karaoke.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9CB3D0842C37BA530062869D /* Karaoke.storyboard */; };
 		9CB3D08B2C37BBA50062869D /* KaraokeListingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CB3D08A2C37BBA50062869D /* KaraokeListingVC.swift */; };
 		9CB3D08D2C37CDD60062869D /* KaraokeListingVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CB3D08C2C37CDD50062869D /* KaraokeListingVM.swift */; };
@@ -403,7 +403,6 @@
 		5202AB002BDFA7900043B7BD /* EmailValidation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailValidation.swift; sourceTree = "<group>"; };
 		520346942C64E29A00D0BD20 /* MyListViewAllCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyListViewAllCell.swift; sourceTree = "<group>"; };
 		520346952C64E29A00D0BD20 /* MyListViewAllCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyListViewAllCell.xib; sourceTree = "<group>"; };
-		520B15082C74652D00C14E5E /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = "<group>"; };
 		520B150A2C746A2700C14E5E /* UsernameCheckVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsernameCheckVC.swift; sourceTree = "<group>"; };
 		520B150C2C746AFF00C14E5E /* UserNameDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserNameDM.swift; sourceTree = "<group>"; };
 		520B6E3E2C0751E90091C478 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Theme.strings; sourceTree = "<group>"; };
@@ -709,6 +708,7 @@
 		9C9BEEC62BEE1BBF004ECC2F /* CollectionViewCenteredFlowLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewCenteredFlowLayout.swift; sourceTree = "<group>"; };
 		9CA7C6BF2C1093E500D73742 /* ProfileVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileVC.swift; sourceTree = "<group>"; };
 		9CA7C6C12C1095B600D73742 /* ProfileVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileVM.swift; sourceTree = "<group>"; };
+		9CB06D2B2C7506B500B82096 /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = "<group>"; };
 		9CB3D0842C37BA530062869D /* Karaoke.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Karaoke.storyboard; sourceTree = "<group>"; };
 		9CB3D08A2C37BBA50062869D /* KaraokeListingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KaraokeListingVC.swift; sourceTree = "<group>"; };
 		9CB3D08C2C37CDD50062869D /* KaraokeListingVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KaraokeListingVM.swift; sourceTree = "<group>"; };
@@ -944,7 +944,7 @@
 				9C535DC82C00C34000DA6DCD /* Theme */,
 				52DAC6462C21761700E2F85B /* WebSeries */,
 				9C834ED92C1C20EC00B29A9C /* WOKA.entitlements */,
-				520B15072C74652D00C14E5E /* WOKA.xcdatamodeld */,
+				9CB06D2A2C7506B500B82096 /* WOKA.xcdatamodeld */,
 				52ACC1292C610EC900791528 /* PersistentStorage.swift */,
 			);
 			path = WOKA;
@@ -2266,7 +2266,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				520B15092C74652D00C14E5E /* WOKA.xcdatamodeld in Sources */,
 				9C535DC62C00BF2400DA6DCD /* HomeExploreCell.swift in Sources */,
 				52D774EF2BDFC50D001D87DE /* StringValidations.swift in Sources */,
 				52A6DCC52C4F8EA800F63C51 /* CartListVC.swift in Sources */,
@@ -2461,6 +2460,7 @@
 				52ACC1262C610CBC00791528 /* UserClicks+CoreDataProperties.swift in Sources */,
 				9CBCB29D2BE4D6BB007D7934 /* LoginVM.swift in Sources */,
 				52BBFCB42C5275E100F7D0D1 /* AddressListVM.swift in Sources */,
+				9CB06D2C2C7506B500B82096 /* WOKA.xcdatamodeld in Sources */,
 				524C42312C0499560016A11C /* NotificationCenterReloads.swift in Sources */,
 				9C8C4FAE2C1315410017DD3B /* WebViewVC.swift in Sources */,
 				52BBFCB62C52764B00F7D0D1 /* AddressListDM.swift in Sources */,
@@ -3096,14 +3096,14 @@
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */
-		520B15072C74652D00C14E5E /* WOKA.xcdatamodeld */ = {
+		9CB06D2A2C7506B500B82096 /* WOKA.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				520B15082C74652D00C14E5E /* WOKA.xcdatamodel */,
+				9CB06D2B2C7506B500B82096 /* WOKA.xcdatamodel */,
 			);
-			currentVersion = 520B15082C74652D00C14E5E /* WOKA.xcdatamodel */;
+			currentVersion = 9CB06D2B2C7506B500B82096 /* WOKA.xcdatamodel */;
 			name = WOKA.xcdatamodeld;
-			path = /Users/macbookpro/Desktop/WOKA/WOKA/WOKA.xcdatamodeld;
+			path = /Users/bilal/Desktop/woka_native_ios_swift/WOKA/WOKA.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
 		};
diff --git a/WOKA/Home/Controller/MyListVC.swift b/WOKA/Home/Controller/MyListVC.swift
index 881a1ea..023c034 100644
--- a/WOKA/Home/Controller/MyListVC.swift
+++ b/WOKA/Home/Controller/MyListVC.swift
@@ -288,9 +288,9 @@ extension MyListVC : CollectionViewSRC{
 //            }
         }
         
-        cell.btnTapped = { [self] (type) -> Void in
+//        cell.btnTapped = { [self] (type) -> Void in
 //            updateFavLikes(cv: collectionView, type: type, index: indexPath.row)
-        }
+//        }
         
         return cell
     }
diff --git a/WOKA/Theme/Base.lproj/Theme.storyboard b/WOKA/Theme/Base.lproj/Theme.storyboard
index 73c3bc9..e61bb71 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"/>
@@ -23,43 +23,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="305" 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"/>
@@ -67,7 +67,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>
@@ -78,13 +78,13 @@
                                 </connections>
                             </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="5" translatesAutoresizingMaskIntoConstraints="NO" id="JE2-1V-ByS">
-                                        <rect key="frame" x="37.666666666666664" y="52.666666666666671" width="99.666666666666686" height="24"/>
+                                        <rect key="frame" x="37.666666666666664" y="57" width="99.666666666666686" height="24"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hello" textAlignment="center" lineBreakMode="wordWrap" 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"/>
@@ -94,7 +94,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User" textAlignment="center" lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tQN-s8-9SK">
-                                                <rect key="frame" x="55.333333333333343" y="0.0" width="44.333333333333343" height="24"/>
+                                                <rect key="frame" x="55.333333333333314" y="0.0" width="44.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"/>
@@ -103,7 +103,7 @@
                                         </subviews>
                                     </stackView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Welcome to WOKALAND" textAlignment="center" lineBreakMode="tailTruncation" 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"/>
@@ -111,24 +111,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"/>
@@ -144,23 +144,23 @@
                                 </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 userInteractionEnabled="NO" 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="14.333333333333329" y="64.666666666666657" width="185.33333333333337" height="125"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </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>
                                     <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="hei-Wl-o3h">
-                                        <rect key="frame" x="79.333333333333329" y="97" width="37" height="37"/>
+                                        <rect key="frame" x="88.666666666666657" y="108.66666666666666" width="37" height="37"/>
                                         <color key="color" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </activityIndicatorView>
                                 </subviews>
@@ -184,7 +184,7 @@
                                 </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"/>
@@ -217,19 +217,19 @@
                                 </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>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qS4-gX-qTX">
-                                        <rect key="frame" x="288" y="0.0" width="95" height="95"/>
+                                        <rect key="frame" x="316" y="-20" width="104" height="104"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ehe-Th-asW" userLabel="Shop">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="95"/>
+                                                <rect key="frame" x="0.0" 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="89" width="104" height="15"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="15" id="QSf-0H-Fwk"/>
                                                         </constraints>
@@ -250,16 +250,16 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="feU-AA-gLO">
-                                        <rect key="frame" x="149" y="50" width="95" height="95"/>
+                                        <rect key="frame" x="163" y="35" width="104" height="104"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="lRy-nX-Xia" userLabel="LiveTV">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="95"/>
+                                                <rect key="frame" x="0.0" y="0.0" 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="79.999999999999943" width="95" height="15"/>
+                                                        <rect key="frame" x="0.0" y="88.999999999999943" width="104" height="15"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="15" id="Ff3-ym-Dew"/>
                                                         </constraints>
@@ -280,16 +280,16 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GGC-rX-Pyw">
-                                        <rect key="frame" x="10" y="75" width="95" height="95"/>
+                                        <rect key="frame" x="10" y="65" width="104" height="104"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="Sp0-yh-bdj" userLabel="WebSeries">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="95"/>
+                                                <rect key="frame" x="0.0" y="0.0" 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="79.999999999999943" width="95" height="15"/>
+                                                        <rect key="frame" x="0.0" y="88.999999999999943" width="104" height="15"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="15" id="tmo-ie-b2U"/>
                                                         </constraints>
@@ -310,16 +310,16 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yuF-d6-Tag">
-                                        <rect key="frame" x="293" y="115" width="95" height="95"/>
+                                        <rect key="frame" x="321" y="103.99999999999994" width="104" height="104"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="r88-JP-phS" userLabel="Games">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="95"/>
+                                                <rect key="frame" x="0.0" y="0.0" 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="79.999999999999943" 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>
@@ -340,16 +340,16 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ugr-Tf-Y1l">
-                                        <rect key="frame" x="160" y="209.99999999999994" width="95" height="95"/>
+                                        <rect key="frame" x="204" y="200.99999999999994" width="104" height="104"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="JHO-R6-WGZ" userLabel="Audio Books">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="95"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="104" 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="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="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" width="95" height="15"/>
+                                                        <rect key="frame" x="0.0" y="89" width="104" height="15"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="15" id="978-3e-GXx"/>
                                                         </constraints>
@@ -370,16 +370,16 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gk8-xm-Hh5">
-                                        <rect key="frame" x="10" y="199.99999999999994" width="95" height="95"/>
+                                        <rect key="frame" x="35" y="198.99999999999994" width="104" height="104"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="1" translatesAutoresizingMaskIntoConstraints="NO" id="9fz-vc-Ufb" userLabel="Karaoke">
-                                                <rect key="frame" x="0.0" y="0.0" width="95" height="95"/>
+                                                <rect key="frame" x="0.0" y="0.0" 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"/>
+                                                        <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" 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>
@@ -388,10 +388,6 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="95" id="Mnv-Cn-1mN"/>
-                                                    <constraint firstAttribute="width" constant="95" id="st2-Tx-v7T"/>
-                                                </constraints>
                                             </stackView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -408,32 +404,32 @@
                                 <constraints>
                                     <constraint firstItem="gk8-xm-Hh5" firstAttribute="top" secondItem="GGC-rX-Pyw" secondAttribute="bottom" constant="30" id="6fZ-aH-GOz"/>
                                     <constraint firstItem="GGC-rX-Pyw" firstAttribute="leading" secondItem="ppi-HI-rj1" secondAttribute="leading" constant="10" id="Go0-Ui-etR"/>
-                                    <constraint firstItem="ugr-Tf-Y1l" firstAttribute="centerY" secondItem="gk8-xm-Hh5" secondAttribute="centerY" constant="10" id="Mqx-zA-KmU"/>
-                                    <constraint firstItem="feU-AA-gLO" firstAttribute="centerY" secondItem="qS4-gX-qTX" secondAttribute="centerY" constant="50" id="VEY-tc-r6X"/>
+                                    <constraint firstItem="gk8-xm-Hh5" firstAttribute="centerX" secondItem="GGC-rX-Pyw" secondAttribute="centerX" constant="25" id="Huz-WW-LHs"/>
+                                    <constraint firstItem="ugr-Tf-Y1l" firstAttribute="centerY" secondItem="gk8-xm-Hh5" secondAttribute="centerY" constant="2" id="Mqx-zA-KmU"/>
+                                    <constraint firstItem="feU-AA-gLO" firstAttribute="centerY" secondItem="qS4-gX-qTX" secondAttribute="centerY" constant="55" id="VEY-tc-r6X"/>
                                     <constraint firstAttribute="trailing" secondItem="qS4-gX-qTX" secondAttribute="trailing" constant="10" id="YH1-ZC-Y0B"/>
-                                    <constraint firstItem="qS4-gX-qTX" firstAttribute="top" secondItem="ppi-HI-rj1" secondAttribute="top" id="Z3W-nR-aoM"/>
+                                    <constraint firstItem="qS4-gX-qTX" firstAttribute="top" secondItem="ppi-HI-rj1" secondAttribute="top" constant="-20" id="Z3W-nR-aoM"/>
                                     <constraint firstItem="yuF-d6-Tag" firstAttribute="top" secondItem="qS4-gX-qTX" secondAttribute="bottom" constant="19.999999999999943" id="ZgC-j6-kZn"/>
-                                    <constraint firstItem="gk8-xm-Hh5" firstAttribute="leading" secondItem="ppi-HI-rj1" secondAttribute="leading" constant="10" id="c7p-1g-qdM"/>
-                                    <constraint firstItem="ugr-Tf-Y1l" firstAttribute="leading" secondItem="gk8-xm-Hh5" secondAttribute="trailing" constant="55" id="iiR-AX-YQG"/>
+                                    <constraint firstItem="ugr-Tf-Y1l" firstAttribute="leading" secondItem="gk8-xm-Hh5" secondAttribute="trailing" constant="65" id="iiR-AX-YQG"/>
                                     <constraint firstItem="feU-AA-gLO" firstAttribute="centerX" secondItem="ppi-HI-rj1" secondAttribute="centerX" id="uhu-hH-X3m"/>
-                                    <constraint firstItem="GGC-rX-Pyw" firstAttribute="centerY" secondItem="feU-AA-gLO" secondAttribute="centerY" constant="25" id="vSh-CJ-Awg"/>
+                                    <constraint firstItem="GGC-rX-Pyw" firstAttribute="centerY" secondItem="feU-AA-gLO" secondAttribute="centerY" constant="30" id="vSh-CJ-Awg"/>
                                 </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"/>
                                     </label>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="45" id="0hL-tE-AiW"/>
+                                    <constraint firstAttribute="height" constant="45" id="D7S-jx-wdI"/>
                                     <constraint firstAttribute="width" secondItem="LYo-Uy-0nM" secondAttribute="height" multiplier="1.5:1" id="sgf-5C-jmD"/>
                                 </constraints>
                             </stackView>
@@ -524,21 +520,21 @@
             <objects>
                 <viewController storyboardIdentifier="MoreVC" id="Faj-VN-SMZ" customClass="MoreVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5jA-W9-hbI">
-                        <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>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="MoreBG" translatesAutoresizingMaskIntoConstraints="NO" id="4W1-eK-C1H">
-                                <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"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="g46-bK-0uI">
-                                <rect key="frame" x="0.0" y="69" width="393" height="744"/>
+                                <rect key="frame" x="0.0" y="69" width="430" height="824"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4TT-Wr-ovV">
-                                        <rect key="frame" x="0.0" y="0.0" width="393" height="45"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="430" height="45"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="tu4-1a-dfV" userLabel="More">
-                                                <rect key="frame" x="174" y="0.0" width="45" height="45"/>
+                                                <rect key="frame" x="192.66666666666666" y="0.0" width="45" height="45"/>
                                                 <subviews>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="UpArrowMore" translatesAutoresizingMaskIntoConstraints="NO" id="BkY-MX-g4T">
                                                         <rect key="frame" x="0.0" y="0.0" width="45" height="25"/>
@@ -564,19 +560,19 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="U0W-18-4oe">
-                                        <rect key="frame" x="0.0" y="45" width="393" height="222"/>
+                                        <rect key="frame" x="0.0" y="45" width="430" height="224"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Coming Soon on WOKA" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D2p-c5-usH" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="10" y="10" width="373" height="22"/>
+                                                <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>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UKc-92-GPa">
-                                                <rect key="frame" x="10" y="42" width="373" height="180"/>
+                                                <rect key="frame" x="10" y="44" width="410" height="180"/>
                                                 <subviews>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="MasilaComingSoon" translatesAutoresizingMaskIntoConstraints="NO" id="Kj9-jH-Y88">
-                                                        <rect key="frame" x="7" y="7" width="359" height="140"/>
+                                                        <rect key="frame" x="7" y="7" width="396" height="140"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="140" id="4Ed-zt-52J"/>
                                                         </constraints>
@@ -587,7 +583,7 @@
                                                         </userDefinedRuntimeAttributes>
                                                     </imageView>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="11Q-tE-Z7c" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="126.66666666666666" y="57" width="120" height="40"/>
+                                                        <rect key="frame" x="145" y="57" width="120" height="40"/>
                                                         <color key="backgroundColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="TY4-vs-ytg"/>
@@ -607,7 +603,7 @@
                                                         </connections>
                                                     </button>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MASILA" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="biB-gs-Rgq">
-                                                        <rect key="frame" x="7" y="152" width="359" height="21.666666666666657"/>
+                                                        <rect key="frame" x="7" y="152" width="396" height="21.666666666666657"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" name="TextDarkBlue"/>
                                                         <nil key="highlightedColor"/>
@@ -635,16 +631,16 @@
                                         <edgeInsets key="layoutMargins" top="10" left="10" bottom="0.0" right="10"/>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Qcq-yj-AzB">
-                                        <rect key="frame" x="0.0" y="267" width="393" height="209"/>
+                                        <rect key="frame" x="0.0" y="269" width="430" height="209"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="BLOGS" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lW0-W4-2hl" 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="xup-gW-Kjh">
-                                                <rect key="frame" x="10" y="39" width="373" height="170"/>
+                                                <rect key="frame" x="10" y="39" width="410" height="170"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="170" id="fTZ-PQ-nXX"/>
@@ -661,16 +657,16 @@
                                         <edgeInsets key="layoutMargins" top="10" left="10" bottom="0.0" right="10"/>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="pJu-fq-XmG">
-                                        <rect key="frame" x="0.0" y="476" width="393" height="268"/>
+                                        <rect key="frame" x="0.0" y="478" width="430" height="346"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="WOKA Songs" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FSJ-QT-rAW" 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>
                                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="31Z-fz-1ec">
-                                                <rect key="frame" x="10" y="44" width="373" height="224"/>
+                                                <rect key="frame" x="10" y="44" width="410" height="302"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </tableView>
                                         </subviews>
@@ -707,21 +703,21 @@
             <objects>
                 <viewController storyboardIdentifier="UserNotificationVC" id="GSM-1I-akm" customClass="UserNotificationVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="U8N-8z-auR">
-                        <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>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="4Jz-rO-ToO">
-                                <rect key="frame" x="0.0" y="74" width="393" height="744"/>
+                                <rect key="frame" x="0.0" y="74" width="430" height="824"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </tableView>
                             <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="5iZ-Hr-WYt">
-                                <rect key="frame" x="113.66666666666669" y="315.66666666666669" width="166" height="245.66666666666669"/>
+                                <rect key="frame" x="132" y="355.66666666666669" width="166" height="245.66666666666669"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SupportGirlImage" translatesAutoresizingMaskIntoConstraints="NO" id="mxb-po-4od">
                                         <rect key="frame" x="0.0" y="0.0" width="166" height="166"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Blogs Found" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oc1-tq-uxI" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="176" width="166" height="24"/>
+                                        <rect key="frame" x="0.0" y="175.99999999999994" width="166" 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"/>
@@ -772,14 +768,14 @@
             <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"/>
                                 <subviews>
                                     <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="3yT-Xz-Xmu">
-                                        <rect key="frame" x="178" y="91.666666666666657" width="37" height="37"/>
+                                        <rect key="frame" x="196.66666666666666" y="91.666666666666657" width="37" height="37"/>
                                         <color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </activityIndicatorView>
                                 </subviews>
@@ -799,7 +795,7 @@
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="dUF-uY-OBL">
-                                <rect key="frame" x="348" y="69" width="40" height="40"/>
+                                <rect key="frame" x="385" y="69" width="40" height="40"/>
                                 <subviews>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tl8-VA-AjQ">
                                         <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
@@ -833,7 +829,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="wHk-XC-Cqq" userLabel="Avatar Stack">
-                                <rect key="frame" x="10" y="64" width="318" height="50"/>
+                                <rect key="frame" x="10" y="64" width="355" height="50"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Boy" translatesAutoresizingMaskIntoConstraints="NO" id="4xI-oX-ffb">
                                         <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -843,7 +839,7 @@
                                         </constraints>
                                     </imageView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="LZa-k2-Fa1">
-                                        <rect key="frame" x="60" y="0.0" width="258" height="50"/>
+                                        <rect key="frame" x="60" y="0.0" width="295" height="50"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="Eb9-At-Mtt">
                                                 <rect key="frame" x="0.0" y="0.0" width="53.333333333333336" height="25.666666666666668"/>
@@ -875,22 +871,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="459"/>
+                                <rect key="frame" x="0.0" y="359" width="430" height="539"/>
                                 <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="448"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="430" height="448"/>
                                         <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"/>
@@ -904,19 +900,19 @@
                                                 <cells/>
                                             </collectionView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="02e-rk-u9Q">
-                                                <rect key="frame" x="10" y="194" width="373" height="224"/>
+                                                <rect key="frame" x="10" y="194" width="410" height="224"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Coming Soon on WOKA" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vdt-pC-uNJ" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="10" y="10" width="353" height="24"/>
+                                                        <rect key="frame" x="10" y="10" width="390" 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>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dj6-9c-mxm">
-                                                        <rect key="frame" x="10" y="44" width="353" height="180"/>
+                                                        <rect key="frame" x="10" y="44" width="390" height="180"/>
                                                         <subviews>
                                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="MasilaComingSoon" translatesAutoresizingMaskIntoConstraints="NO" id="l2T-ED-avg">
-                                                                <rect key="frame" x="7" y="7" width="339" height="140"/>
+                                                                <rect key="frame" x="7" y="7" width="376" height="140"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="140" id="GbQ-KX-tc5"/>
                                                                 </constraints>
@@ -927,7 +923,7 @@
                                                                 </userDefinedRuntimeAttributes>
                                                             </imageView>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vca-pu-v34" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                                <rect key="frame" x="116.66666666666666" y="57" width="120" height="40"/>
+                                                                <rect key="frame" x="135" y="57" width="120" height="40"/>
                                                                 <color key="backgroundColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="40" id="K1Z-vZ-Ips"/>
@@ -948,7 +944,7 @@
                                                                 </connections>
                                                             </button>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MASILA" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xhN-tm-LoZ">
-                                                                <rect key="frame" x="7" y="152" width="339" height="21.666666666666657"/>
+                                                                <rect key="frame" x="7" y="152" width="376" height="21.666666666666657"/>
                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                 <color key="textColor" name="TextDarkBlue"/>
                                                                 <nil key="highlightedColor"/>
@@ -978,7 +974,7 @@
                                                 <edgeInsets key="layoutMargins" top="10" left="10" bottom="0.0" right="10"/>
                                             </stackView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K3K-3D-e9X">
-                                                <rect key="frame" x="10" y="428" width="373" height="20"/>
+                                                <rect key="frame" x="10" y="428" width="410" height="20"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="Etm-uk-Fs9"/>
@@ -1040,7 +1036,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"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dli-ld-4dd">
@@ -1083,22 +1079,22 @@
             <objects>
                 <viewController storyboardIdentifier="BlogsVC" id="JL8-U7-koy" customClass="BlogsVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="SOW-xX-Eu0">
-                        <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="Uty-mq-usL">
-                                <rect key="frame" x="0.0" y="59" width="393" height="793"/>
+                                <rect key="frame" x="0.0" y="59" width="430" height="873"/>
                                 <color key="backgroundColor" red="0.035294117647058823" green="0.0" blue="0.36470588235294116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BottomImageBlog" translatesAutoresizingMaskIntoConstraints="NO" id="WrA-I6-O47">
-                                <rect key="frame" x="0.0" y="452" width="393" height="400"/>
+                                <rect key="frame" x="0.0" y="532" width="430" height="400"/>
                                 <color key="tintColor" red="0.1058823529" green="0.050980392159999999" blue="0.60392156860000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="400" id="hDP-ND-hZT"/>
                                 </constraints>
                             </imageView>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="CPI-Sd-MIf">
-                                <rect key="frame" x="0.0" y="69" width="393" height="783"/>
+                                <rect key="frame" x="0.0" y="69" width="430" height="863"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="X8i-uF-7dA">
                                     <size key="itemSize" width="128" height="128"/>
@@ -1109,7 +1105,7 @@
                                 <cells/>
                             </collectionView>
                             <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Nqj-wh-mOZ">
-                                <rect key="frame" x="93.666666666666686" y="295.66666666666669" width="206" height="245.66666666666669"/>
+                                <rect key="frame" x="112" y="335.66666666666669" width="206" height="245.66666666666669"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SupportGirlImage" translatesAutoresizingMaskIntoConstraints="NO" id="aKI-uI-tys">
                                         <rect key="frame" x="0.0" y="0.0" width="206" height="166"/>
@@ -1121,7 +1117,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JCl-tp-aCA">
-                                        <rect key="frame" x="0.0" y="210" width="206" height="35.666666666666657"/>
+                                        <rect key="frame" x="0.0" y="209.99999999999994" width="206" height="35.666666666666657"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain">
@@ -1173,21 +1169,21 @@
             <objects>
                 <viewController storyboardIdentifier="BlogDetailsVC" id="m3z-AW-Y67" customClass="BlogDetailsVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="2ie-fT-lBU">
-                        <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 alpha="0.60000002384185791" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bQW-EN-5cE">
-                                <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"/>
                                 <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <stackView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Piw-bm-f3k">
-                                <rect key="frame" x="20" y="99" width="353" height="679"/>
+                                <rect key="frame" x="20" y="99" width="390" height="759"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d1Y-Ir-lq2">
-                                        <rect key="frame" x="0.0" y="8" width="353" height="35"/>
+                                        <rect key="frame" x="0.0" y="8" width="390" height="35"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5mY-JI-eL1">
-                                                <rect key="frame" x="313" y="0.0" width="35" height="35"/>
+                                                <rect key="frame" x="350" y="0.0" width="35" height="35"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="5mY-JI-eL1" secondAttribute="height" multiplier="1:1" id="Rcf-Zx-41P"/>
                                                 </constraints>
@@ -1208,13 +1204,13 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="0zg-E5-h57">
-                                        <rect key="frame" x="0.0" y="53" width="353" height="180"/>
+                                        <rect key="frame" x="0.0" y="53" width="390" height="197"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7PR-nA-m6o" customClass="ShadowView" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="15" y="0.0" width="323" height="180"/>
+                                                <rect key="frame" x="15" y="0.0" width="360" height="197"/>
                                                 <subviews>
                                                     <imageView opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2FK-rk-obG">
-                                                        <rect key="frame" x="0.0" y="0.0" width="323" height="180"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="360" height="197"/>
                                                         <color key="backgroundColor" systemColor="systemBrownColor"/>
                                                     </imageView>
                                                 </subviews>
@@ -1238,13 +1234,13 @@
                                         <edgeInsets key="layoutMargins" top="0.0" left="15" bottom="0.0" right="15"/>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="dPM-yr-RKo">
-                                        <rect key="frame" x="0.0" y="243" width="353" height="436"/>
+                                        <rect key="frame" x="0.0" y="260" width="390" height="499"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="LyT-t9-LuK">
-                                                <rect key="frame" x="15" y="5" width="323" height="174.33333333333334"/>
+                                                <rect key="frame" x="15" y="5" width="360" height="237.66666666666666"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r5a-5v-xNf">
-                                                        <rect key="frame" x="0.0" y="0.0" width="323" height="174.33333333333334"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="360" height="237.66666666666666"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" name="TextDarkBlue"/>
                                                         <nil key="highlightedColor"/>
@@ -1252,7 +1248,7 @@
                                                 </subviews>
                                             </stackView>
                                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" editable="NO" usesAttributedText="YES" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2tU-Z6-Wgy">
-                                                <rect key="frame" x="15" y="189.33333333333337" width="323" height="236.66666666666663"/>
+                                                <rect key="frame" x="15" y="252.66666666666663" width="360" height="236.33333333333337"/>
                                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                 <attributedString key="attributedText"/>
                                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -1333,7 +1329,7 @@
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemBrownColor">
-            <color red="0.63529411764705879" green="0.51764705882352946" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.63529411759999999" green="0.51764705879999995" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/WOKA/Theme/Controller/PlayerVC.swift b/WOKA/Theme/Controller/PlayerVC.swift
index 437ab9d..6e47ab4 100644
--- a/WOKA/Theme/Controller/PlayerVC.swift
+++ b/WOKA/Theme/Controller/PlayerVC.swift
@@ -207,15 +207,24 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate{
 
     // MARK: - JWPlayerViewControllerDelegate
     
-//    override func jwplayerPlaylistHasCompleted(_ player: any JWPlayer) {
-//        print("PlayList Over")
-//    }
+    override func jwplayerPlaylistHasCompleted(_ player: any JWPlayer) {
+        super.jwplayerPlaylistHasCompleted(player)
+        // if playlist is finised make sure to add it to user video view
+        vm.updateUserView()
+        print("PlayList Over", vm.currentPlayingIndex)
+    }
     
     // this will give index
     override func jwplayer(_ player: any JWPlayer, didLoadPlaylistItem item: JWPlayerItem, at index: UInt) {
         super.jwplayer(player, didLoadPlaylistItem: item, at: index)
         print("didLoadPlaylistItem ", index)
-        vm.currentPlayingIndex = Int(index)
+        if vm.currentPlayingIndex != -1 && vm.currentPlayingIndex != index{
+            // so update the loaded index and increase the current playing index
+            vm.updateUserView()
+            vm.currentPlayingIndex = Int(index)
+        }else{
+            vm.currentPlayingIndex = Int(index)
+        }
     }
     
     override func jwplayer(_ player: any JWPlayer, didFinishLoadingWithTime loadTime: TimeInterval) {
diff --git a/WOKA/Theme/Controller/ThemeOneVC.swift b/WOKA/Theme/Controller/ThemeOneVC.swift
index e873026..6fa1fac 100644
--- a/WOKA/Theme/Controller/ThemeOneVC.swift
+++ b/WOKA/Theme/Controller/ThemeOneVC.swift
@@ -80,7 +80,8 @@ class ThemeOneVC: UIViewController {
         
 //        PersistentStorage.shared.deleteData()
 //        PersistentStorage.shared.retrieveData()
-
+        vm.setupAvPlayer()
+        
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -105,8 +106,7 @@ class ThemeOneVC: UIViewController {
     }
     
     override func viewDidLayoutSubviews() {
-        vm.setupAvPlayer()
-        self.addObservers()
+        vm.playerLayer.frame = self.liveTvPlayer.bounds
     }
     
     // Define a function to customize tab bar item icon size
diff --git a/WOKA/Theme/ViewModel/PlayerVM.swift b/WOKA/Theme/ViewModel/PlayerVM.swift
index e381105..e1cadb4 100644
--- a/WOKA/Theme/ViewModel/PlayerVM.swift
+++ b/WOKA/Theme/ViewModel/PlayerVM.swift
@@ -22,7 +22,7 @@ class PlayerVM{
     var catID : Int?
     
     // this will store the index of the item playing
-    var currentPlayingIndex = 0
+    var currentPlayingIndex = -1
 
     func initView(){
         switch vc.contentType {
diff --git a/WOKA/Theme/ViewModel/ThemeOneVM.swift b/WOKA/Theme/ViewModel/ThemeOneVM.swift
index ab07696..833e234 100644
--- a/WOKA/Theme/ViewModel/ThemeOneVM.swift
+++ b/WOKA/Theme/ViewModel/ThemeOneVM.swift
@@ -46,44 +46,7 @@ class ThemeOneVM{
         NotificationCenter.default.addObserver(self, selector: #selector(self.themeOnePush(notification:)), name: NSNotification.Name(rawValue: K.NotificationCenterReloads.themeOnePush), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(self.reloadTheme), name: NSNotification.Name(rawValue: K.NotificationCenterReloads.reloadTheme), object: nil)
     }
-    
-    func setupAvPlayer(){
-        /*
-         Av Player Setup
-         */
-        guard let data = AuthFunc.shareInstance.staticURLs , let liveStreamData = data.liveData?.first else{
-            self.vc.toast(msg: "Issue with live streaming", time: 2)
-            return
-        }
-        var url = String()
-        //        var title = String()
         
-        if AuthFunc.shareInstance.languageSelected == .english{
-            url = liveStreamData.liveURL?.hdURLEn ?? ""
-            //            title = liveStreamData.name?.titleEn ?? ""
-        }else{
-            url = liveStreamData.liveURL?.hdURLHin ?? ""
-            //            title = liveStreamData.name?.titleHin ?? ""
-        }
-        
-        guard let streamURL = URL(string: url) else{return}
-        
-        playerItem = AVPlayerItem(url: streamURL)
-        
-        // Create AVPlayer with the stream URL
-        avPlayer = AVPlayer(playerItem: playerItem)
-        //        avPlayer.isMuted = true
-        
-        // Create AVPlayerLayer
-        playerLayer = AVPlayerLayer(player: avPlayer)
-        playerLayer.videoGravity = .resizeAspectFill // You can set different videoGravity as per your need
-        
-        playerLayer.frame = self.vc.liveTvPlayer.bounds
-        self.vc.liveTvPlayer.layer.addSublayer(playerLayer)
-        
-        avPlayer.volume = 0
-    }
-    
     // MARK: - start stop activity Indicator
     
     func startStopActivity(isStart : Bool){
@@ -289,7 +252,48 @@ class ThemeOneVM{
         }
     }
     
-    // MARK: - Animate Clouds and LiveTV
+    // MARK: - Animate Clouds and LiveTV and setupAv Player
+    
+    func setupAvPlayer(){
+        /*
+         Av Player Setup
+         */
+        guard let data = AuthFunc.shareInstance.staticURLs , let liveStreamData = data.liveData?.first else{
+            self.vc.toast(msg: "Issue with live streaming", time: 2)
+            return
+        }
+        var url = String()
+        //        var title = String()
+        
+        if AuthFunc.shareInstance.languageSelected == .english{
+            url = liveStreamData.liveURL?.hdURLEn ?? ""
+            //            title = liveStreamData.name?.titleEn ?? ""
+        }else{
+            url = liveStreamData.liveURL?.hdURLHin ?? ""
+            //            title = liveStreamData.name?.titleHin ?? ""
+        }
+        
+        guard let streamURL = URL(string: url) else{return}
+        
+        playerItem = AVPlayerItem(url: streamURL)
+        
+        // Create AVPlayer with the stream URL
+        avPlayer = AVPlayer(playerItem: playerItem)
+        //        avPlayer.isMuted = true
+        
+        // Create AVPlayerLayer
+        playerLayer = AVPlayerLayer(player: avPlayer)
+        playerLayer.videoGravity = .resizeAspectFill // You can set different videoGravity as per your need
+        
+        
+        // Remove any existing sublayers to avoid duplicates
+        self.vc.liveTvPlayer.layer.sublayers?.forEach { $0.removeFromSuperlayer() }
+        
+        self.vc.liveTvPlayer.layer.addSublayer(playerLayer)
+        
+        avPlayer.volume = 0
+        vc.addObservers()
+    }
     
     func centerLiveTVViewHorizontally() {
         DispatchQueue.main.async { [weak self] in