diff --git a/UIKitCatalog.xcodeproj/project.pbxproj b/UIKitCatalog.xcodeproj/project.pbxproj
index 0f0d942..7914a6e 100644
--- a/UIKitCatalog.xcodeproj/project.pbxproj
+++ b/UIKitCatalog.xcodeproj/project.pbxproj
@@ -88,8 +88,6 @@
 		228DB9F318BC53F1002BA12A /* UIKitCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UIKitCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		228DB9F718BC53F1002BA12A /* UIKitCatalog-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "UIKitCatalog-Info.plist"; sourceTree = "<group>"; };
 		228DBA0718BC53F1002BA12A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		2CCCDF102CCCDC9000000001 /* LICENSE.txt */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE.txt; sourceTree = "<group>"; };
-		2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */ = {isa = PBXFileReference; name = SampleCode.xcconfig; path = Configuration/SampleCode.xcconfig; sourceTree = "<group>"; };
 		3E5C084F1974991E00969DD7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		5312D0F122848B0200048DE2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = Base.lproj/Credits.rtf; sourceTree = "<group>"; };
 		533BD78C1F8BE1A6007D5C3B /* DetailViewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewManager.swift; sourceTree = "<group>"; };
@@ -123,6 +121,8 @@
 		53CE5AF71F2A8BD000D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SwitchViewController.storyboard; sourceTree = "<group>"; };
 		53CE5AFA1F2A8BEB00D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/TextFieldViewController.storyboard; sourceTree = "<group>"; };
 		53DDE73C22776382000006CF /* UIKitCatalog.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = UIKitCatalog.entitlements; sourceTree = "<group>"; };
+		A5E23920A5E1025000000001 /* SampleCode.xcconfig */ = {isa = PBXFileReference; name = SampleCode.xcconfig; path = Configuration/SampleCode.xcconfig; sourceTree = "<group>"; };
+		A5EBFB80A5EC59A000000001 /* LICENSE.txt */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE.txt; sourceTree = "<group>"; };
 		B50F41071B1D284700E5147D /* StackViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -145,8 +145,8 @@
 				228DB9F518BC53F1002BA12A /* UIKitCatalog */,
 				228DB9F418BC53F1002BA12A /* Products */,
 				53654E212298881100B999C7 /* Frameworks */,
-				2CDDD4C02CDDD48000000001 /* Configuration */,
-				2CCCD8802CCCCF2000000001 /* LICENSE */,
+				A5E0F2E0A5E0BC9000000001 /* Configuration */,
+				A5EE7870A5EE774000000001 /* LICENSE */,
 			);
 			sourceTree = "<group>";
 		};
@@ -206,23 +206,6 @@
 			name = Toolbar;
 			sourceTree = "<group>";
 		};
-		2CCCD8802CCCCF2000000001 /* LICENSE */ = {
-			isa = PBXGroup;
-			children = (
-				2CCCDF102CCCDC9000000001 /* LICENSE.txt */,
-			);
-			name = LICENSE;
-			path = LICENSE;
-			sourceTree = "<group>";
-		};
-		2CDDD4C02CDDD48000000001 /* Configuration */ = {
-			isa = PBXGroup;
-			children = (
-				2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */,
-			);
-			name = Configuration;
-			sourceTree = "<group>";
-		};
 		3E1DA7601931CC99000114A9 /* View Controllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -293,6 +276,23 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		A5E0F2E0A5E0BC9000000001 /* Configuration */ = {
+			isa = PBXGroup;
+			children = (
+				A5E23920A5E1025000000001 /* SampleCode.xcconfig */,
+			);
+			name = Configuration;
+			sourceTree = "<group>";
+		};
+		A5EE7870A5EE774000000001 /* LICENSE */ = {
+			isa = PBXGroup;
+			children = (
+				A5EBFB80A5EC59A000000001 /* LICENSE.txt */,
+			);
+			name = LICENSE;
+			path = LICENSE;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -618,7 +618,7 @@
 /* Begin XCBuildConfiguration section */
 		228DBA0918BC53F1002BA12A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */;
+			baseConfigurationReference = A5E23920A5E1025000000001 /* SampleCode.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -674,7 +674,7 @@
 		};
 		228DBA0A18BC53F1002BA12A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */;
+			baseConfigurationReference = A5E23920A5E1025000000001 /* SampleCode.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -723,11 +723,12 @@
 		};
 		228DBA0C18BC53F1002BA12A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */;
+			baseConfigurationReference = A5E23920A5E1025000000001 /* SampleCode.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = UIKitCatalog/UIKitCatalog.entitlements;
-				DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "$(SRCROOT)/UIKitCatalog/UIKitCatalog-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -735,7 +736,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}${SAMPLE_CODE_DISAMBIGUATOR}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SUPPORTS_UIKITFORMAC = YES;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -744,11 +745,12 @@
 		};
 		228DBA0D18BC53F1002BA12A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2CDE19A02CDE1AB000000001 /* SampleCode.xcconfig */;
+			baseConfigurationReference = A5E23920A5E1025000000001 /* SampleCode.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = UIKitCatalog/UIKitCatalog.entitlements;
-				DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "$(SRCROOT)/UIKitCatalog/UIKitCatalog-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -756,7 +758,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}${SAMPLE_CODE_DISAMBIGUATOR}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SUPPORTS_UIKITFORMAC = YES;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/UIKitCatalog/Base.lproj/LaunchScreen.storyboard b/UIKitCatalog/Base.lproj/LaunchScreen.storyboard
index 9186575..1ec8e6d 100644
--- a/UIKitCatalog/Base.lproj/LaunchScreen.storyboard
+++ b/UIKitCatalog/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.11" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4yX-ry-qSy">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4yX-ry-qSy">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.13"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -30,6 +30,7 @@
                     <view key="view" contentMode="scaleToFill" id="Bd8-dr-7ve">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="m5c-PM-dSX"/>
                     </view>
                     <navigationItem key="navigationItem" title="UIKitCatalog" id="uDS-kc-Hwh"/>
diff --git a/UIKitCatalog/Base.lproj/TextFieldViewController.storyboard b/UIKitCatalog/Base.lproj/TextFieldViewController.storyboard
index 0495660..29ea6d5 100644
--- a/UIKitCatalog/Base.lproj/TextFieldViewController.storyboard
+++ b/UIKitCatalog/Base.lproj/TextFieldViewController.storyboard
@@ -53,21 +53,21 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cMZ-kh-7qC">
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HOG-Yp-juH">
                                                     <rect key="frame" x="77.5" y="5" width="220" height="34"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="220" id="mK5-gY-ciJ"/>
+                                                        <constraint firstAttribute="width" constant="220" id="LtQ-yh-RuD"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <textInputTraits key="textInputTraits"/>
                                                     <connections>
-                                                        <outlet property="delegate" destination="DSJ-7r-oCY" id="kMQ-KL-sNz"/>
+                                                        <outlet property="delegate" destination="DSJ-7r-oCY" id="cAt-Pg-ihE"/>
                                                     </connections>
                                                 </textField>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="cMZ-kh-7qC" firstAttribute="centerY" secondItem="3ka-jS-1aS" secondAttribute="centerY" id="aeT-Q6-LcM"/>
-                                                <constraint firstItem="cMZ-kh-7qC" firstAttribute="centerX" secondItem="3ka-jS-1aS" secondAttribute="centerX" id="beb-bt-uhP"/>
+                                                <constraint firstItem="HOG-Yp-juH" firstAttribute="centerX" secondItem="3ka-jS-1aS" secondAttribute="centerX" id="DRS-zK-WcP"/>
+                                                <constraint firstItem="HOG-Yp-juH" firstAttribute="centerY" secondItem="3ka-jS-1aS" secondAttribute="centerY" id="RkA-1I-yPa"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -197,7 +197,7 @@
                         <outlet property="secureTextField" destination="6hY-Wr-WkQ" id="Q5H-ZR-LOf"/>
                         <outlet property="specificKeyboardTextField" destination="3ok-UO-qNK" id="6Ba-Of-HrL"/>
                         <outlet property="textField" destination="d0M-ZQ-Bl5" id="vN0-aU-p1n"/>
-                        <outlet property="tintedTextField" destination="cMZ-kh-7qC" id="nd8-iZ-8dm"/>
+                        <outlet property="tintedTextField" destination="HOG-Yp-juH" id="zFM-DP-kUM"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="OdI-IP-47Q" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/UIKitCatalog/Base.lproj/WebViewController.storyboard b/UIKitCatalog/Base.lproj/WebViewController.storyboard
index 87083b1..d335aaa 100644
--- a/UIKitCatalog/Base.lproj/WebViewController.storyboard
+++ b/UIKitCatalog/Base.lproj/WebViewController.storyboard
@@ -17,7 +17,7 @@
                         <subviews>
                             <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cu4-ZC-P43">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                                <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                 <wkWebViewConfiguration key="configuration">
                                     <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
                                     <wkPreferences key="preferences"/>
@@ -26,10 +26,10 @@
                         </subviews>
                         <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstAttribute="bottom" secondItem="cu4-ZC-P43" secondAttribute="bottom" id="Yzw-MH-mMD"/>
-                            <constraint firstAttribute="top" secondItem="cu4-ZC-P43" secondAttribute="top" id="klp-F9-Fdi"/>
-                            <constraint firstItem="cu4-ZC-P43" firstAttribute="leading" secondItem="cde-Ag-lVB" secondAttribute="leading" id="mOa-eb-xkv"/>
-                            <constraint firstAttribute="trailing" secondItem="cu4-ZC-P43" secondAttribute="trailing" id="nPH-BV-Pe3"/>
+                            <constraint firstItem="cu4-ZC-P43" firstAttribute="leading" secondItem="2L2-qR-4mQ" secondAttribute="leading" id="38U-tt-Pxa"/>
+                            <constraint firstItem="2L2-qR-4mQ" firstAttribute="bottom" secondItem="cu4-ZC-P43" secondAttribute="bottom" id="Ee1-kG-Bbh"/>
+                            <constraint firstItem="2L2-qR-4mQ" firstAttribute="trailing" secondItem="cu4-ZC-P43" secondAttribute="trailing" id="Mqf-0F-mfm"/>
+                            <constraint firstItem="cu4-ZC-P43" firstAttribute="top" secondItem="2L2-qR-4mQ" secondAttribute="top" id="d1U-7W-j7C"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="2L2-qR-4mQ"/>
                     </view>