Merge branch 'develop'

Feels (iOS).entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.88oak.ifeel</string>
+		<string>iCloud.com.88oakapps.ifeel</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -14,7 +14,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.88oak.ifeel</string>
+		<string>group.com.88oakapps.ifeel</string>
 	</array>
 </dict>
 </plist>

Feels (iOS)Dev.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.88oak.ifeelDebug</string>
+		<string>iCloud.com.88oakapps.ifeelDebug</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -14,7 +14,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.88oak.ifeelDebug</string>
+		<string>group.com.88oakapps.ifeelDebug</string>
 	</array>
 </dict>
 </plist>

Feels.xcodeproj/project.pbxproj

@@ -18,10 +18,22 @@
 		1C04489727C2DB9B00D22444 /* BGView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603127A5C1C800C520BD /* BGView.swift */; };
 		1C04489927C3F24000D22444 /* Color+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04489827C3F24000D22444 /* Color+Codable.swift */; };
 		1C04489A27C3F24F00D22444 /* Color+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C04489827C3F24000D22444 /* Color+Codable.swift */; };
+		1C0A3C8F27FD445000FF37FF /* OnboardingCustomizeOne.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C0A3C8E27FD445000FF37FF /* OnboardingCustomizeOne.swift */; };
+		1C0A3C9127FD445900FF37FF /* OnboardingCustomizeTwo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C0A3C9027FD445900FF37FF /* OnboardingCustomizeTwo.swift */; };
 		1C0DAB45279DB0FB003B1F21 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1C0DAB47279DB0FB003B1F21 /* Localizable.strings */; };
 		1C10E24E27A1AB110047948B /* UserDefaultsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */; };
 		1C10E25027A1AB220047948B /* OnboardingDay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03774279A294800D26164 /* OnboardingDay.swift */; };
 		1C10E25127A1AB320047948B /* OnboardingTitle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03776279A295600D26164 /* OnboardingTitle.swift */; };
+		1C1AFF3027F894970067F9DC /* ThemePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF2F27F894970067F9DC /* ThemePickerView.swift */; };
+		1C1AFF3227F894A40067F9DC /* IconPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3127F894A40067F9DC /* IconPickerView.swift */; };
+		1C1AFF3427F894BA0067F9DC /* TintPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3327F894BA0067F9DC /* TintPickerView.swift */; };
+		1C1AFF3827F8951F0067F9DC /* CustomWigetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3727F8951F0067F9DC /* CustomWigetView.swift */; };
+		1C1AFF3A27F895490067F9DC /* ImagePackPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3927F895490067F9DC /* ImagePackPickerView.swift */; };
+		1C1AFF3C27F895800067F9DC /* TextColorPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3B27F895800067F9DC /* TextColorPickerView.swift */; };
+		1C1AFF3E27F895A40067F9DC /* PersonalityPackPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF3D27F895A40067F9DC /* PersonalityPackPickerView.swift */; };
+		1C1AFF4127F895C00067F9DC /* ShapePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF4027F895C00067F9DC /* ShapePickerView.swift */; };
+		1C1AFF4327F895D90067F9DC /* DayFilterPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AFF4227F895D90067F9DC /* DayFilterPickerView.swift */; };
+		1C1B6E6927FD4E8F00181E70 /* SampleEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C1B6E6827FD4E8F00181E70 /* SampleEntryView.swift */; };
 		1C2162EB27C14EFA004353D1 /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162EA27C14EFA004353D1 /* Date+Extensions.swift */; };
 		1C2162EC27C14FC5004353D1 /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162EA27C14EFA004353D1 /* Date+Extensions.swift */; };
 		1C2162EE27C15191004353D1 /* MoodEntryFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162ED27C15191004353D1 /* MoodEntryFunctions.swift */; };
@@ -31,10 +43,9 @@
 		1C2162F727C16D11004353D1 /* MoodTintable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162F627C16D11004353D1 /* MoodTintable.swift */; };
 		1C2162F827C16E3C004353D1 /* MoodTintable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2162F627C16D11004353D1 /* MoodTintable.swift */; };
 		1C2618FA2795E41D00FDC148 /* Charts in Frameworks */ = {isa = PBXBuildFile; productRef = 1C2618F92795E41D00FDC148 /* Charts */; };
-		1C2618FE27960A4F00FDC148 /* FilterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2618FD27960A4F00FDC148 /* FilterViewModel.swift */; };
+		1C2618FE27960A4F00FDC148 /* YearViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C2618FD27960A4F00FDC148 /* YearViewModel.swift */; };
 		1C26190327960CE500FDC148 /* ChartDataBuildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C26190227960CE500FDC148 /* ChartDataBuildable.swift */; };
 		1C26190727960DC900FDC148 /* ChartViewItemBuildable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C26190627960DC900FDC148 /* ChartViewItemBuildable.swift */; };
-		1C2C5B2A27DD7D300092A308 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1CD90AF0278C7DE0001C4FEA /* Assets.xcassets */; };
 		1C2C5B2B27DEBE260092A308 /* EventLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C414C2F27DB1C2400BC1720 /* EventLogger.swift */; };
 		1C358FAD27ADD0C3002C83A6 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FAC27ADD0C3002C83A6 /* Theme.swift */; };
 		1C358FB127B0AD87002C83A6 /* SharingListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C358FB027B0AD87002C83A6 /* SharingListView.swift */; };
@@ -76,12 +87,20 @@
 		1C658D7827C0744D003231EE /* PersistenceUPDATE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C658D7627C0744D003231EE /* PersistenceUPDATE.swift */; };
 		1C683FCA2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; };
 		1C683FCB2792281400745862 /* Stats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C683FC92792281400745862 /* Stats.swift */; };
+		1C718C7027F611C900A8F9FE /* DaysFilterClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */; };
+		1C718C7127F611C900A8F9FE /* DaysFilterClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */; };
+		1C718C7327F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */; };
+		1C718C7427F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */; };
 		1C7352B927DD02760024B5D2 /* ImagePickerGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C7352B827DD02760024B5D2 /* ImagePickerGridView.swift */; };
 		1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C744F2B278CE15600953A57 /* AppDelegate.swift */; };
 		1C747CC9279F06EB00762CBD /* CloudKitSyncMonitor in Frameworks */ = {isa = PBXBuildFile; productRef = 1C747CC8279F06EB00762CBD /* CloudKitSyncMonitor */; };
 		1C76E86E27C882A400ADEE1F /* SharingImageModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */; };
 		1C76E86F27C882A400ADEE1F /* SharingImageModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */; };
-		1CA037702799FFA600D26164 /* HomeViewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA0376F2799FFA600D26164 /* HomeViewViewModel.swift */; };
+		1C95ABC927E6F73A00509BD3 /* Shapes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABC827E6F73A00509BD3 /* Shapes.swift */; };
+		1C95ABCA27E6F73A00509BD3 /* Shapes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABC827E6F73A00509BD3 /* Shapes.swift */; };
+		1C95ABCC27E6FA7200509BD3 /* DiamondView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */; };
+		1C95ABCD27E6FA7200509BD3 /* DiamondView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */; };
+		1CA037702799FFA600D26164 /* DayViewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA0376F2799FFA600D26164 /* DayViewViewModel.swift */; };
 		1CA03773279A293D00D26164 /* OnboardingTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03772279A293D00D26164 /* OnboardingTime.swift */; };
 		1CA03775279A294800D26164 /* OnboardingDay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03774279A294800D26164 /* OnboardingDay.swift */; };
 		1CA03777279A295600D26164 /* OnboardingTitle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CA03776279A295600D26164 /* OnboardingTitle.swift */; };
@@ -91,11 +110,11 @@
 		1CAD603427A5C1C800C520BD /* SmallRollUpHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602B27A5C1C800C520BD /* SmallRollUpHeaderView.swift */; };
 		1CAD603527A5C1C800C520BD /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602C27A5C1C800C520BD /* SettingsView.swift */; };
 		1CAD603627A5C1C800C520BD /* GraphView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602D27A5C1C800C520BD /* GraphView.swift */; };
-		1CAD603727A5C1C800C520BD /* FilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602E27A5C1C800C520BD /* FilterView.swift */; };
+		1CAD603727A5C1C800C520BD /* YearView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602E27A5C1C800C520BD /* YearView.swift */; };
 		1CAD603827A5C1C800C520BD /* AddMoodHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD602F27A5C1C800C520BD /* AddMoodHeaderView.swift */; };
 		1CAD603927A5C1C800C520BD /* HeaderPercView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603027A5C1C800C520BD /* HeaderPercView.swift */; };
 		1CAD603A27A5C1C800C520BD /* BGView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603127A5C1C800C520BD /* BGView.swift */; };
-		1CAD603B27A5C1C800C520BD /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603227A5C1C800C520BD /* HomeView.swift */; };
+		1CAD603B27A5C1C800C520BD /* DayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603227A5C1C800C520BD /* DayView.swift */; };
 		1CAD603C27A5C1C800C520BD /* HeaderStatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */; };
 		1CAD603E27A6ECCD00C520BD /* SwitchableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CAD603D27A6ECCD00C520BD /* SwitchableView.swift */; };
 		1CB101C527B62A2D00D1C033 /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB101C427B62A2D00D1C033 /* EmptyView.swift */; };
@@ -182,14 +201,26 @@
 		1C04488927C2ABD500D22444 /* IconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconView.swift; sourceTree = "<group>"; };
 		1C04488C27C2ADDB00D22444 /* IconViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconViewModel.swift; sourceTree = "<group>"; };
 		1C04489827C3F24000D22444 /* Color+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Codable.swift"; sourceTree = "<group>"; };
+		1C0A3C8E27FD445000FF37FF /* OnboardingCustomizeOne.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCustomizeOne.swift; sourceTree = "<group>"; };
+		1C0A3C9027FD445900FF37FF /* OnboardingCustomizeTwo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCustomizeTwo.swift; sourceTree = "<group>"; };
 		1C0DAB46279DB0FB003B1F21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		1C0DAB48279DB116003B1F21 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
+		1C1AFF2F27F894970067F9DC /* ThemePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemePickerView.swift; sourceTree = "<group>"; };
+		1C1AFF3127F894A40067F9DC /* IconPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconPickerView.swift; sourceTree = "<group>"; };
+		1C1AFF3327F894BA0067F9DC /* TintPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TintPickerView.swift; sourceTree = "<group>"; };
+		1C1AFF3727F8951F0067F9DC /* CustomWigetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomWigetView.swift; sourceTree = "<group>"; };
+		1C1AFF3927F895490067F9DC /* ImagePackPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePackPickerView.swift; sourceTree = "<group>"; };
+		1C1AFF3B27F895800067F9DC /* TextColorPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextColorPickerView.swift; sourceTree = "<group>"; };
+		1C1AFF3D27F895A40067F9DC /* PersonalityPackPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalityPackPickerView.swift; sourceTree = "<group>"; };
+		1C1AFF4027F895C00067F9DC /* ShapePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShapePickerView.swift; sourceTree = "<group>"; };
+		1C1AFF4227F895D90067F9DC /* DayFilterPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayFilterPickerView.swift; sourceTree = "<group>"; };
+		1C1B6E6827FD4E8F00181E70 /* SampleEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleEntryView.swift; sourceTree = "<group>"; };
 		1C2162EA27C14EFA004353D1 /* Date+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extensions.swift"; sourceTree = "<group>"; };
 		1C2162ED27C15191004353D1 /* MoodEntryFunctions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodEntryFunctions.swift; sourceTree = "<group>"; };
 		1C2162F127C156E6004353D1 /* CustomizeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomizeView.swift; sourceTree = "<group>"; };
 		1C2162F327C1602D004353D1 /* MoodImagable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodImagable.swift; sourceTree = "<group>"; };
 		1C2162F627C16D11004353D1 /* MoodTintable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoodTintable.swift; sourceTree = "<group>"; };
-		1C2618FD27960A4F00FDC148 /* FilterViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterViewModel.swift; sourceTree = "<group>"; };
+		1C2618FD27960A4F00FDC148 /* YearViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YearViewModel.swift; sourceTree = "<group>"; };
 		1C26190227960CE500FDC148 /* ChartDataBuildable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartDataBuildable.swift; sourceTree = "<group>"; };
 		1C26190627960DC900FDC148 /* ChartViewItemBuildable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartViewItemBuildable.swift; sourceTree = "<group>"; };
 		1C358FAC27ADD0C3002C83A6 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
@@ -217,10 +248,14 @@
 		1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsStore.swift; sourceTree = "<group>"; };
 		1C658D7627C0744D003231EE /* PersistenceUPDATE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceUPDATE.swift; sourceTree = "<group>"; };
 		1C683FC92792281400745862 /* Stats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stats.swift; sourceTree = "<group>"; };
+		1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DaysFilterClass.swift; sourceTree = "<group>"; };
+		1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StupidAssCustomWidgetObservableObject.swift; sourceTree = "<group>"; };
 		1C7352B827DD02760024B5D2 /* ImagePickerGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePickerGridView.swift; sourceTree = "<group>"; };
 		1C744F2B278CE15600953A57 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingImageModels.swift; sourceTree = "<group>"; };
-		1CA0376F2799FFA600D26164 /* HomeViewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewViewModel.swift; sourceTree = "<group>"; };
+		1C95ABC827E6F73A00509BD3 /* Shapes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shapes.swift; sourceTree = "<group>"; };
+		1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiamondView.swift; sourceTree = "<group>"; };
+		1CA0376F2799FFA600D26164 /* DayViewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DayViewViewModel.swift; sourceTree = "<group>"; };
 		1CA03772279A293D00D26164 /* OnboardingTime.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTime.swift; sourceTree = "<group>"; };
 		1CA03774279A294800D26164 /* OnboardingDay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDay.swift; sourceTree = "<group>"; };
 		1CA03776279A295600D26164 /* OnboardingTitle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTitle.swift; sourceTree = "<group>"; };
@@ -229,11 +264,11 @@
 		1CAD602B27A5C1C800C520BD /* SmallRollUpHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SmallRollUpHeaderView.swift; sourceTree = "<group>"; };
 		1CAD602C27A5C1C800C520BD /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		1CAD602D27A5C1C800C520BD /* GraphView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphView.swift; sourceTree = "<group>"; };
-		1CAD602E27A5C1C800C520BD /* FilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterView.swift; sourceTree = "<group>"; };
+		1CAD602E27A5C1C800C520BD /* YearView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YearView.swift; sourceTree = "<group>"; };
 		1CAD602F27A5C1C800C520BD /* AddMoodHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddMoodHeaderView.swift; sourceTree = "<group>"; };
 		1CAD603027A5C1C800C520BD /* HeaderPercView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderPercView.swift; sourceTree = "<group>"; };
 		1CAD603127A5C1C800C520BD /* BGView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BGView.swift; sourceTree = "<group>"; };
-		1CAD603227A5C1C800C520BD /* HomeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
+		1CAD603227A5C1C800C520BD /* DayView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DayView.swift; sourceTree = "<group>"; };
 		1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeaderStatsView.swift; sourceTree = "<group>"; };
 		1CAD603D27A6ECCD00C520BD /* SwitchableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchableView.swift; sourceTree = "<group>"; };
 		1CB101C427B62A2D00D1C033 /* EmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = "<group>"; };
@@ -245,7 +280,7 @@
 		1CD90AED278C7DDF001C4FEA /* FeelsApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeelsApp.swift; sourceTree = "<group>"; };
 		1CD90AEF278C7DDF001C4FEA /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
 		1CD90AF0278C7DE0001C4FEA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		1CD90AF5278C7DE0001C4FEA /* iFeel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iFeel.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		1CD90AF5278C7DE0001C4FEA /* iFeels.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iFeels.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1CD90AFB278C7DE0001C4FEA /* Feels.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Feels.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1CD90AFD278C7DE0001C4FEA /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = "<group>"; };
 		1CD90B02278C7DE0001C4FEA /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -322,13 +357,13 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		1C04488F27C2CA9C00D22444 /* HomeView */ = {
+		1C04488F27C2CA9C00D22444 /* DayView */ = {
 			isa = PBXGroup;
 			children = (
-				1CAD603227A5C1C800C520BD /* HomeView.swift */,
-				1CA0376F2799FFA600D26164 /* HomeViewViewModel.swift */,
+				1CAD603227A5C1C800C520BD /* DayView.swift */,
+				1CA0376F2799FFA600D26164 /* DayViewViewModel.swift */,
 			);
-			path = HomeView;
+			path = DayView;
 			sourceTree = "<group>";
 		};
 		1C04489027C2CAAC00D22444 /* CustomIcon */ = {
@@ -354,6 +389,7 @@
 			isa = PBXGroup;
 			children = (
 				1C2162F127C156E6004353D1 /* CustomizeView.swift */,
+				1C1AFF4427F898E40067F9DC /* SubViews */,
 			);
 			path = CustomizeView;
 			sourceTree = "<group>";
@@ -366,13 +402,13 @@
 			path = SettingsView;
 			sourceTree = "<group>";
 		};
-		1C04489427C2CAD100D22444 /* FilterView */ = {
+		1C04489427C2CAD100D22444 /* YearView */ = {
 			isa = PBXGroup;
 			children = (
-				1C2618FD27960A4F00FDC148 /* FilterViewModel.swift */,
-				1CAD602E27A5C1C800C520BD /* FilterView.swift */,
+				1CAD602E27A5C1C800C520BD /* YearView.swift */,
+				1C2618FD27960A4F00FDC148 /* YearViewModel.swift */,
 			);
-			path = FilterView;
+			path = YearView;
 			sourceTree = "<group>";
 		};
 		1C04489527C2CB1A00D22444 /* Sharing */ = {
@@ -383,6 +419,22 @@
 			path = Sharing;
 			sourceTree = "<group>";
 		};
+		1C1AFF4427F898E40067F9DC /* SubViews */ = {
+			isa = PBXGroup;
+			children = (
+				1C1AFF3727F8951F0067F9DC /* CustomWigetView.swift */,
+				1C1AFF4227F895D90067F9DC /* DayFilterPickerView.swift */,
+				1C1AFF3127F894A40067F9DC /* IconPickerView.swift */,
+				1C1AFF3927F895490067F9DC /* ImagePackPickerView.swift */,
+				1C1AFF3D27F895A40067F9DC /* PersonalityPackPickerView.swift */,
+				1C1AFF4027F895C00067F9DC /* ShapePickerView.swift */,
+				1C1AFF3B27F895800067F9DC /* TextColorPickerView.swift */,
+				1C1AFF2F27F894970067F9DC /* ThemePickerView.swift */,
+				1C1AFF3327F894BA0067F9DC /* TintPickerView.swift */,
+			);
+			path = SubViews;
+			sourceTree = "<group>";
+		};
 		1C26190127960CDA00FDC148 /* Protocols */ = {
 			isa = PBXGroup;
 			children = (
@@ -443,6 +495,8 @@
 				1CA03772279A293D00D26164 /* OnboardingTime.swift */,
 				1CA03774279A294800D26164 /* OnboardingDay.swift */,
 				1CA03776279A295600D26164 /* OnboardingTitle.swift */,
+				1C0A3C8E27FD445000FF37FF /* OnboardingCustomizeOne.swift */,
+				1C0A3C9027FD445900FF37FF /* OnboardingCustomizeTwo.swift */,
 				1CA0377B279B605000D26164 /* OnboardingWrapup.swift */,
 			);
 			path = views;
@@ -459,13 +513,14 @@
 				1C04489127C2CAB100D22444 /* CustomWidget */,
 				1CC469AB27907D48003E0C6E /* DayChartView.swift */,
 				1CB101C427B62A2D00D1C033 /* EmptyView.swift */,
-				1C04489427C2CAD100D22444 /* FilterView */,
+				1C04489427C2CAD100D22444 /* YearView */,
 				1CAD602D27A5C1C800C520BD /* GraphView.swift */,
 				1CAD603027A5C1C800C520BD /* HeaderPercView.swift */,
 				1CAD603327A5C1C800C520BD /* HeaderStatsView.swift */,
-				1C04488F27C2CA9C00D22444 /* HomeView */,
+				1C04488F27C2CA9C00D22444 /* DayView */,
 				1C361F0B27C0356B00E832FC /* MainTabView.swift */,
 				1C4DAA7327CC263F00C25D2B /* MonthView */,
+				1C1B6E6827FD4E8F00181E70 /* SampleEntryView.swift */,
 				1C04489327C2CABF00D22444 /* SettingsView */,
 				1C04489527C2CB1A00D22444 /* Sharing */,
 				1C358FB427B0ADF3002C83A6 /* SharingTemplates */,
@@ -525,7 +580,7 @@
 		1CD90AF6278C7DE0001C4FEA /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				1CD90AF5278C7DE0001C4FEA /* iFeel.app */,
+				1CD90AF5278C7DE0001C4FEA /* iFeels.app */,
 				1CD90AFB278C7DE0001C4FEA /* Feels.app */,
 				1CD90B02278C7DE0001C4FEA /* Tests iOS.xctest */,
 				1CD90B0E278C7DE0001C4FEA /* Tests macOS.xctest */,
@@ -584,6 +639,8 @@
 		1CD90B60278C7EBA001C4FEA /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				1C718C6F27F611C900A8F9FE /* DaysFilterClass.swift */,
+				1C95ABCB27E6FA7200509BD3 /* DiamondView.swift */,
 				1CD90B61278C7EBA001C4FEA /* Mood.swift */,
 				1CD90B62278C7EBA001C4FEA /* MoodEntryExtension.swift */,
 				1C2162F327C1602D004353D1 /* MoodImagable.swift */,
@@ -591,7 +648,9 @@
 				1C2162F627C16D11004353D1 /* MoodTintable.swift */,
 				1C361F1327C03C8600E832FC /* OnboardingDataDataManager.swift */,
 				1C04488627C1C81D00D22444 /* PersonalityPackable.swift */,
+				1C95ABC827E6F73A00509BD3 /* Shapes.swift */,
 				1C76E86D27C882A400ADEE1F /* SharingImageModels.swift */,
+				1C718C7227F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift */,
 				1C358FAC27ADD0C3002C83A6 /* Theme.swift */,
 				1C5F4977279C945E0092F1B4 /* UserDefaultsStore.swift */,
 			);
@@ -622,7 +681,7 @@
 				1C414C2D27DB1B9B00BC1720 /* FirebaseAnalyticsWithoutAdIdSupport */,
 			);
 			productName = "Feels (iOS)";
-			productReference = 1CD90AF5278C7DE0001C4FEA /* iFeel.app */;
+			productReference = 1CD90AF5278C7DE0001C4FEA /* iFeels.app */;
 			productType = "com.apple.product-type.application";
 		};
 		1CD90AFA278C7DE0001C4FEA /* Feels (macOS) */ = {
@@ -793,7 +852,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				1CD90B50278C7E7A001C4FEA /* Assets.xcassets in Resources */,
-				1C2C5B2A27DD7D300092A308 /* Assets.xcassets in Resources */,
 				1C414C2B27DB1AF900BC1720 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -805,38 +863,48 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1CA037702799FFA600D26164 /* HomeViewViewModel.swift in Sources */,
+				1CA037702799FFA600D26164 /* DayViewViewModel.swift in Sources */,
 				1CA03773279A293D00D26164 /* OnboardingTime.swift in Sources */,
 				1CAD603927A5C1C800C520BD /* HeaderPercView.swift in Sources */,
+				1C0A3C8F27FD445000FF37FF /* OnboardingCustomizeOne.swift in Sources */,
 				1CAD603C27A5C1C800C520BD /* HeaderStatsView.swift in Sources */,
 				1CAD603827A5C1C800C520BD /* AddMoodHeaderView.swift in Sources */,
 				1CA0377C279B605000D26164 /* OnboardingWrapup.swift in Sources */,
 				1C4FF3C327BEE07200BE8F34 /* PersistenceDELETE.swift in Sources */,
 				1CA03775279A294800D26164 /* OnboardingDay.swift in Sources */,
-				1CAD603727A5C1C800C520BD /* FilterView.swift in Sources */,
+				1C1AFF3C27F895800067F9DC /* TextColorPickerView.swift in Sources */,
+				1CAD603727A5C1C800C520BD /* YearView.swift in Sources */,
 				1C04488D27C2ADDB00D22444 /* IconViewModel.swift in Sources */,
 				1C2162F227C156E6004353D1 /* CustomizeView.swift in Sources */,
+				1C1AFF3E27F895A40067F9DC /* PersonalityPackPickerView.swift in Sources */,
 				1C683FCA2792281400745862 /* Stats.swift in Sources */,
 				1C76E86E27C882A400ADEE1F /* SharingImageModels.swift in Sources */,
+				1C718C7327F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */,
 				1CAD603E27A6ECCD00C520BD /* SwitchableView.swift in Sources */,
 				1CD90B76278C8119001C4FEA /* LocalNotification.swift in Sources */,
 				1C358FB627B0AE15002C83A6 /* AllMoodsTotalTemplate.swift in Sources */,
 				1CD90B16278C7DE0001C4FEA /* Feels.xcdatamodeld in Sources */,
+				1C1AFF3027F894970067F9DC /* ThemePickerView.swift in Sources */,
+				1C1AFF4327F895D90067F9DC /* DayFilterPickerView.swift in Sources */,
 				1C04488727C1C81D00D22444 /* PersonalityPackable.swift in Sources */,
+				1C0A3C9127FD445900FF37FF /* OnboardingCustomizeTwo.swift in Sources */,
 				1C4FF3BE27BEDF9100BE8F34 /* PersistenceHelper.swift in Sources */,
 				1CC469AA278F30A0003E0C6E /* BGTask.swift in Sources */,
-				1CAD603B27A5C1C800C520BD /* HomeView.swift in Sources */,
+				1C95ABC927E6F73A00509BD3 /* Shapes.swift in Sources */,
+				1CAD603B27A5C1C800C520BD /* DayView.swift in Sources */,
 				1C5F4976279C84090092F1B4 /* OnboardingData.swift in Sources */,
 				1CAD603427A5C1C800C520BD /* SmallRollUpHeaderView.swift in Sources */,
 				1CAD603A27A5C1C800C520BD /* BGView.swift in Sources */,
 				1C26190727960DC900FDC148 /* ChartViewItemBuildable.swift in Sources */,
 				1CD90B5D278C7EAD001C4FEA /* Random.swift in Sources */,
-				1C2618FE27960A4F00FDC148 /* FilterViewModel.swift in Sources */,
+				1C2618FE27960A4F00FDC148 /* YearViewModel.swift in Sources */,
 				1C744F2C278CE15600953A57 /* AppDelegate.swift in Sources */,
 				1CD90B63278C7EBA001C4FEA /* Mood.swift in Sources */,
+				1C1B6E6927FD4E8F00181E70 /* SampleEntryView.swift in Sources */,
 				1C358FBE27B4D1F2002C83A6 /* CurrentStreakTemplate.swift in Sources */,
 				1C4FF3C727BEE09E00BE8F34 /* PersistenceADD.swift in Sources */,
 				1C414C0F27D51FB500BC1720 /* EntryListView.swift in Sources */,
+				1C1AFF3827F8951F0067F9DC /* CustomWigetView.swift in Sources */,
 				1C4FF3BB27BEDDF000BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */,
 				1CAD603527A5C1C800C520BD /* SettingsView.swift in Sources */,
 				1CD90B53278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */,
@@ -853,6 +921,7 @@
 				1C7352B927DD02760024B5D2 /* ImagePickerGridView.swift in Sources */,
 				1C358FB327B0ADA4002C83A6 /* SharingTemplate.swift in Sources */,
 				1C358FB827B0AEE3002C83A6 /* LongestStreakTemplate.swift in Sources */,
+				1C1AFF4127F895C00067F9DC /* ShapePickerView.swift in Sources */,
 				1C358FB127B0AD87002C83A6 /* SharingListView.swift in Sources */,
 				1CD90B1C278C7DE0001C4FEA /* Persistence.swift in Sources */,
 				1CEC966F27B9C29300CC8688 /* CustomWidgetView.swift in Sources */,
@@ -863,6 +932,7 @@
 				1CD90B18278C7DE0001C4FEA /* FeelsApp.swift in Sources */,
 				1C358FC027B4D20C002C83A6 /* MonthTotalTemplate.swift in Sources */,
 				1CA03777279A295600D26164 /* OnboardingTitle.swift in Sources */,
+				1C1AFF3A27F895490067F9DC /* ImagePackPickerView.swift in Sources */,
 				1C4FF3C027BEE06900BE8F34 /* PersistenceGET.swift in Sources */,
 				1C04488A27C2ABD500D22444 /* IconView.swift in Sources */,
 				1C361F0C27C0356B00E832FC /* MainTabView.swift in Sources */,
@@ -871,9 +941,13 @@
 				1C361F0A27C0356000E832FC /* MonthView.swift in Sources */,
 				1C361F1427C03C8600E832FC /* OnboardingDataDataManager.swift in Sources */,
 				1C358FAD27ADD0C3002C83A6 /* Theme.swift in Sources */,
+				1C718C7027F611C900A8F9FE /* DaysFilterClass.swift in Sources */,
+				1C95ABCC27E6FA7200509BD3 /* DiamondView.swift in Sources */,
 				1C2162EB27C14EFA004353D1 /* Date+Extensions.swift in Sources */,
 				1C02589C27B9677A00EB91AC /* CreateWidgetView.swift in Sources */,
+				1C1AFF3227F894A40067F9DC /* IconPickerView.swift in Sources */,
 				1C04489927C3F24000D22444 /* Color+Codable.swift in Sources */,
+				1C1AFF3427F894BA0067F9DC /* TintPickerView.swift in Sources */,
 				1C358FC227B4D227002C83A6 /* WeekTotalTemplate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -919,6 +993,7 @@
 				1C76E86F27C882A400ADEE1F /* SharingImageModels.swift in Sources */,
 				1CEC967227B9C9FB00CC8688 /* CustomWidgetView.swift in Sources */,
 				1C2162F827C16E3C004353D1 /* MoodTintable.swift in Sources */,
+				1C95ABCA27E6F73A00509BD3 /* Shapes.swift in Sources */,
 				1C4FF3BC27BEDF6600BE8F34 /* ShowBasedOnVoteLogics.swift in Sources */,
 				1C4FF3C927BEE0C300BE8F34 /* PersistenceHelper.swift in Sources */,
 				1CA2662D2793908700C0E12C /* Persistence.swift in Sources */,
@@ -931,6 +1006,7 @@
 				1C04489727C2DB9B00D22444 /* BGView.swift in Sources */,
 				1CB101C827B81CAC00D1C033 /* MoodMetrics.swift in Sources */,
 				1C683FCB2792281400745862 /* Stats.swift in Sources */,
+				1C718C7127F611C900A8F9FE /* DaysFilterClass.swift in Sources */,
 				1CEC967327B9CA0C00CC8688 /* CustomWidgetModel.swift in Sources */,
 				1C10E25027A1AB220047948B /* OnboardingDay.swift in Sources */,
 				1C04488827C1CD8C00D22444 /* PersonalityPackable.swift in Sources */,
@@ -942,10 +1018,12 @@
 				1C4FF3C127BEE06900BE8F34 /* PersistenceGET.swift in Sources */,
 				1C361F0D27C03BDF00E832FC /* OnboardingData.swift in Sources */,
 				1CD90B52278C7E7A001C4FEA /* FeelsWidget.intentdefinition in Sources */,
+				1C95ABCD27E6FA7200509BD3 /* DiamondView.swift in Sources */,
 				1CD90B4D278C7E7A001C4FEA /* FeelsWidget.swift in Sources */,
 				1C04489627C2DB0100D22444 /* Theme.swift in Sources */,
 				1C361F0F27C03C0E00E832FC /* LocalNotification.swift in Sources */,
 				1C10E24E27A1AB110047948B /* UserDefaultsStore.swift in Sources */,
+				1C718C7427F611E300A8F9FE /* StupidAssCustomWidgetObservableObject.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1108,7 +1186,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 23;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Feels--iOS--Info.plist";
@@ -1123,8 +1201,8 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeelDebug2;
-				PRODUCT_NAME = iFeel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeelDebug;
+				PRODUCT_NAME = iFeels;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1144,7 +1222,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 23;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Feels--iOS--Info.plist";
@@ -1159,8 +1237,8 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeel;
-				PRODUCT_NAME = iFeel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeel;
+				PRODUCT_NAME = iFeels;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1314,10 +1392,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FeelsWidget/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = FeelsWidget;
+				INFOPLIST_KEY_CFBundleDisplayName = iFeelsWidget;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1326,7 +1404,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeelDebug2.FeelsWidgetDebug;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeelDebug.FeelsWidgetDebug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
@@ -1346,10 +1424,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FeelsWidget/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = FeelsWidget;
+				INFOPLIST_KEY_CFBundleDisplayName = iFeelsWidget;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.2;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1358,7 +1436,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeel.FeelsWidget;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeel.FeelsWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;

Feels.xcodeproj/xcshareddata/xcschemes/Feels (iOS).xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "1CD90AF4278C7DE0001C4FEA"
-               BuildableName = "iFeel.app"
+               BuildableName = "iFeels.app"
                BlueprintName = "Feels (iOS)"
                ReferencedContainer = "container:Feels.xcodeproj">
             </BuildableReference>
@@ -55,7 +55,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1CD90AF4278C7DE0001C4FEA"
-            BuildableName = "iFeel.app"
+            BuildableName = "iFeels.app"
             BlueprintName = "Feels (iOS)"
             ReferencedContainer = "container:Feels.xcodeproj">
          </BuildableReference>
@@ -72,7 +72,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1CD90AF4278C7DE0001C4FEA"
-            BuildableName = "iFeel.app"
+            BuildableName = "iFeels.app"
             BlueprintName = "Feels (iOS)"
             ReferencedContainer = "container:Feels.xcodeproj">
          </BuildableReference>

Feels.xcodeproj/xcshareddata/xcschemes/FeelsWidgetExtension.xcscheme

@@ -30,7 +30,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "1CD90AF4278C7DE0001C4FEA"
-               BuildableName = "iFeel.app"
+               BuildableName = "iFeels.app"
                BlueprintName = "Feels (iOS)"
                ReferencedContainer = "container:Feels.xcodeproj">
             </BuildableReference>
@@ -72,7 +72,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1CD90AF4278C7DE0001C4FEA"
-            BuildableName = "iFeel.app"
+            BuildableName = "iFeels.app"
             BlueprintName = "Feels (iOS)"
             ReferencedContainer = "container:Feels.xcodeproj">
          </BuildableReference>
@@ -108,7 +108,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "1CD90AF4278C7DE0001C4FEA"
-            BuildableName = "iFeel.app"
+            BuildableName = "iFeels.app"
             BlueprintName = "Feels (iOS)"
             ReferencedContainer = "container:Feels.xcodeproj">
          </BuildableReference>

FeelsWidget/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FeelsWidget/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "filename" : "iPhone-Notification-20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-Notification-20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-App-60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPhone-App-60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPad-Notification-20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Notification-20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Settings-29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Settings-29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Pro-83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "AppIcon.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FeelsWidget/Assets.xcassets/AppIconAverage.appiconset/Contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "filename" : "iPhone-Notification-20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-Notification-20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-App-60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPhone-App-60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPad-Notification-20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Notification-20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Settings-29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Settings-29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Pro-83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "AppIconAverage.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FeelsWidget/Assets.xcassets/AppIconAverageImage.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "AverageGraphic.png",
+      "filename" : "AppIconAverage.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

FeelsWidget/Assets.xcassets/AppIconBad.appiconset/Contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "filename" : "iPhone-Notification-20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-Notification-20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-App-60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPhone-App-60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPad-Notification-20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Notification-20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Settings-29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Settings-29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Pro-83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "AppIconBad.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FeelsWidget/Assets.xcassets/AppIconBadImage.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "BadGraphic.png",
+      "filename" : "AppIconBad.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

FeelsWidget/Assets.xcassets/AppIconBlueGreen.appiconset/Contents.json

@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "filename" : "iPhone-Notification-20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-Notification-20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPhone-29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-Spotlight-40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPhone-App-60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPhone-App-60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "iPad-Notification-20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Notification-20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "iPad-Settings-29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Settings-29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Spotlight-76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "iPad-Pro-83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "AppIconBlueGreen.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}