diff --git a/Demo/ScrollingNavbarDemo/Base.lproj/Main.storyboard b/Demo/ScrollingNavbarDemo/Base.lproj/Main.storyboard
index 2e44c562..ad359b2e 100644
--- a/Demo/ScrollingNavbarDemo/Base.lproj/Main.storyboard
+++ b/Demo/ScrollingNavbarDemo/Base.lproj/Main.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="8DR-mA-2ri">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="8DR-mA-2ri">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -99,160 +100,148 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="oAR-et-LnE">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <sections>
                             <tableViewSection id="MXX-s7-znZ">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="100" id="z0e-AJ-b6q">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="100"/>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" rowHeight="60" id="z0e-AJ-b6q">
+                                        <rect key="frame" x="0.0" y="24.5" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="z0e-AJ-b6q" id="l4w-st-A99">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349.5" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ScrollView" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6js-Eb-YdK">
-                                                    <rect key="frame" x="8" y="8" width="359" height="84"/>
-                                                    <color key="backgroundColor" red="0.98026317358016968" green="0.98026317358016968" blue="0.98026317358016968" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ScrollView" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PE2-nv-f4r">
+                                                    <rect key="frame" x="16" y="21" width="325.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="6js-Eb-YdK" firstAttribute="leading" secondItem="l4w-st-A99" secondAttribute="leading" constant="8" id="EmP-2u-vEj"/>
-                                                <constraint firstAttribute="bottom" secondItem="6js-Eb-YdK" secondAttribute="bottom" constant="8" id="KSL-Yt-cXu"/>
-                                                <constraint firstItem="6js-Eb-YdK" firstAttribute="top" secondItem="l4w-st-A99" secondAttribute="top" constant="8" id="bYH-uf-CiH"/>
-                                                <constraint firstAttribute="trailing" secondItem="6js-Eb-YdK" secondAttribute="trailing" constant="8" id="bpR-Jk-e98"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="PE2-nv-f4r" secondAttribute="trailing" id="2Qk-LO-PpJ"/>
+                                                <constraint firstItem="PE2-nv-f4r" firstAttribute="leading" secondItem="l4w-st-A99" secondAttribute="leadingMargin" id="3ij-v0-UHY"/>
+                                                <constraint firstItem="PE2-nv-f4r" firstAttribute="centerY" secondItem="l4w-st-A99" secondAttribute="centerY" id="Fhy-Lb-pdS"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <segue destination="txF-pk-oEs" kind="show" id="G0i-ZJ-GCz"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="100" id="PGy-v4-EuK">
-                                        <rect key="frame" x="0.0" y="128" width="375" height="100"/>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" rowHeight="60" id="PGy-v4-EuK">
+                                        <rect key="frame" x="0.0" y="84.5" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PGy-v4-EuK" id="TZH-n6-ih4">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349.5" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TableView" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vla-cj-iTM">
-                                                    <rect key="frame" x="8" y="8" width="359" height="84"/>
-                                                    <color key="backgroundColor" red="0.98000001907348633" green="0.98000001907348633" blue="0.98000001907348633" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TableView" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LmL-oZ-cAL">
+                                                    <rect key="frame" x="16" y="21" width="325.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="Vla-cj-iTM" firstAttribute="leading" secondItem="TZH-n6-ih4" secondAttribute="leading" constant="8" id="H1B-kG-RVy"/>
-                                                <constraint firstAttribute="trailing" secondItem="Vla-cj-iTM" secondAttribute="trailing" constant="8" id="NwL-N7-VWV"/>
-                                                <constraint firstItem="Vla-cj-iTM" firstAttribute="top" secondItem="TZH-n6-ih4" secondAttribute="top" constant="8" id="exg-cR-ke5"/>
-                                                <constraint firstAttribute="bottom" secondItem="Vla-cj-iTM" secondAttribute="bottom" constant="8" id="inm-su-07S"/>
+                                                <constraint firstItem="LmL-oZ-cAL" firstAttribute="centerY" secondItem="TZH-n6-ih4" secondAttribute="centerY" id="JPf-O3-4JJ"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="LmL-oZ-cAL" secondAttribute="trailing" id="Lwt-d4-WSd"/>
+                                                <constraint firstItem="LmL-oZ-cAL" firstAttribute="leading" secondItem="TZH-n6-ih4" secondAttribute="leadingMargin" id="bpp-yX-Ihz"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <segue destination="OGR-K0-LTQ" kind="show" id="3F3-X8-9Q0"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="100" id="jWs-VD-nem">
-                                        <rect key="frame" x="0.0" y="228" width="375" height="100"/>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" rowHeight="60" id="jWs-VD-nem">
+                                        <rect key="frame" x="0.0" y="144.5" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jWs-VD-nem" id="3Ja-CF-bbf">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349.5" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WebView" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HjF-5u-mpt">
-                                                    <rect key="frame" x="16" y="11" width="343" height="78"/>
-                                                    <color key="backgroundColor" red="0.98000001907348633" green="0.98000001907348633" blue="0.98000001907348633" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WebView" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YVy-ik-6pL">
+                                                    <rect key="frame" x="16" y="21" width="325.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="HjF-5u-mpt" firstAttribute="bottom" secondItem="3Ja-CF-bbf" secondAttribute="bottomMargin" id="45c-Bz-PbT"/>
-                                                <constraint firstItem="HjF-5u-mpt" firstAttribute="leading" secondItem="3Ja-CF-bbf" secondAttribute="leadingMargin" id="EdC-gT-ec3"/>
-                                                <constraint firstItem="HjF-5u-mpt" firstAttribute="top" secondItem="3Ja-CF-bbf" secondAttribute="topMargin" id="GfN-2E-2Mt"/>
-                                                <constraint firstItem="HjF-5u-mpt" firstAttribute="trailing" secondItem="3Ja-CF-bbf" secondAttribute="trailingMargin" id="RJ5-3d-oYd"/>
+                                                <constraint firstItem="YVy-ik-6pL" firstAttribute="leading" secondItem="3Ja-CF-bbf" secondAttribute="leadingMargin" id="GOW-PJ-A0O"/>
+                                                <constraint firstItem="YVy-ik-6pL" firstAttribute="centerY" secondItem="3Ja-CF-bbf" secondAttribute="centerY" id="sg6-sy-U40"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="YVy-ik-6pL" secondAttribute="trailing" id="x2g-tE-rgA"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <segue destination="Q5s-G0-ypn" kind="show" id="oRv-MW-DeK"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="100" id="X5t-MF-ozU">
-                                        <rect key="frame" x="0.0" y="328" width="375" height="100"/>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" rowHeight="60" id="X5t-MF-ozU">
+                                        <rect key="frame" x="0.0" y="204.5" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X5t-MF-ozU" id="MT5-EC-9UL">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349.5" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CollectionView" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lfV-fX-VJ4">
-                                                    <rect key="frame" x="16" y="11" width="343" height="78"/>
-                                                    <color key="backgroundColor" red="0.98000001907348633" green="0.98000001907348633" blue="0.98000001907348633" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CollectionView" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZX7-g7-KdC">
+                                                    <rect key="frame" x="16" y="21" width="325.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="lfV-fX-VJ4" firstAttribute="trailing" secondItem="MT5-EC-9UL" secondAttribute="trailingMargin" id="dli-0c-Z9b"/>
-                                                <constraint firstItem="lfV-fX-VJ4" firstAttribute="leading" secondItem="MT5-EC-9UL" secondAttribute="leadingMargin" id="epC-JP-dhG"/>
-                                                <constraint firstItem="lfV-fX-VJ4" firstAttribute="bottom" secondItem="MT5-EC-9UL" secondAttribute="bottomMargin" id="nFy-VG-yqz"/>
-                                                <constraint firstItem="lfV-fX-VJ4" firstAttribute="top" secondItem="MT5-EC-9UL" secondAttribute="topMargin" id="t4d-7N-FN5"/>
+                                                <constraint firstItem="ZX7-g7-KdC" firstAttribute="centerY" secondItem="MT5-EC-9UL" secondAttribute="centerY" id="AoR-Wx-FEf"/>
+                                                <constraint firstItem="ZX7-g7-KdC" firstAttribute="leading" secondItem="MT5-EC-9UL" secondAttribute="leadingMargin" id="RC8-ns-ZdB"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="ZX7-g7-KdC" secondAttribute="trailing" id="Wko-ie-pJL"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <segue destination="vrT-AV-HzV" kind="show" id="97m-9N-yGa"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="100" id="QhN-uQ-Y7X">
-                                        <rect key="frame" x="0.0" y="428" width="375" height="100"/>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" rowHeight="60" id="QhN-uQ-Y7X">
+                                        <rect key="frame" x="0.0" y="264.5" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QhN-uQ-Y7X" id="nNl-99-fRW">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349.5" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TabBar" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mTv-iY-QXS">
-                                                    <rect key="frame" x="16" y="11" width="343" height="78"/>
-                                                    <color key="backgroundColor" red="0.98000001910000001" green="0.98000001910000001" blue="0.98000001910000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TabBar" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pf4-9o-yJz">
+                                                    <rect key="frame" x="16" y="21" width="325.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="mTv-iY-QXS" firstAttribute="top" secondItem="nNl-99-fRW" secondAttribute="topMargin" id="2Qa-De-d6V"/>
-                                                <constraint firstItem="mTv-iY-QXS" firstAttribute="trailing" secondItem="nNl-99-fRW" secondAttribute="trailingMargin" id="EZd-9V-coY"/>
-                                                <constraint firstItem="mTv-iY-QXS" firstAttribute="leading" secondItem="nNl-99-fRW" secondAttribute="leadingMargin" id="Wto-PU-eFe"/>
-                                                <constraint firstItem="mTv-iY-QXS" firstAttribute="bottom" secondItem="nNl-99-fRW" secondAttribute="bottomMargin" id="l9t-Oh-caV"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="Pf4-9o-yJz" secondAttribute="trailing" id="CaO-yh-Wth"/>
+                                                <constraint firstItem="Pf4-9o-yJz" firstAttribute="centerY" secondItem="nNl-99-fRW" secondAttribute="centerY" id="Ivb-FS-dzu"/>
+                                                <constraint firstItem="Pf4-9o-yJz" firstAttribute="leading" secondItem="nNl-99-fRW" secondAttribute="leadingMargin" id="t5q-CB-or9"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <segue destination="kVm-6D-4hD" kind="show" id="kSV-7T-Qx1"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="100" id="FLa-x8-IEK">
-                                        <rect key="frame" x="0.0" y="528" width="375" height="100"/>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Cell" rowHeight="60" id="FLa-x8-IEK">
+                                        <rect key="frame" x="0.0" y="324.5" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FLa-x8-IEK" id="r9v-yJ-BhC">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349.5" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LargeTitles" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T1U-6n-1U7">
-                                                    <rect key="frame" x="16" y="11" width="343" height="78"/>
-                                                    <color key="backgroundColor" red="0.98000001910000001" green="0.98000001910000001" blue="0.98000001910000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LargeTitles" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cJI-gN-nYH">
+                                                    <rect key="frame" x="16" y="21" width="325.5" height="18"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="T1U-6n-1U7" firstAttribute="trailing" secondItem="r9v-yJ-BhC" secondAttribute="trailingMargin" id="4Gp-KE-vGl"/>
-                                                <constraint firstItem="T1U-6n-1U7" firstAttribute="leading" secondItem="r9v-yJ-BhC" secondAttribute="leadingMargin" id="EeW-Y5-GZr"/>
-                                                <constraint firstItem="T1U-6n-1U7" firstAttribute="bottom" secondItem="r9v-yJ-BhC" secondAttribute="bottomMargin" id="RWc-QX-a22"/>
-                                                <constraint firstItem="T1U-6n-1U7" firstAttribute="top" secondItem="r9v-yJ-BhC" secondAttribute="topMargin" id="tnm-gX-ZI0"/>
+                                                <constraint firstItem="cJI-gN-nYH" firstAttribute="centerY" secondItem="r9v-yJ-BhC" secondAttribute="centerY" id="87a-tr-QbW"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="cJI-gN-nYH" secondAttribute="trailing" id="E1A-qe-D0F"/>
+                                                <constraint firstItem="cJI-gN-nYH" firstAttribute="leading" secondItem="r9v-yJ-BhC" secondAttribute="leadingMargin" id="V4A-ZX-xsP"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
@@ -271,7 +260,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Pse-eD-YLf" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1220.625" y="373.94366197183098"/>
+            <point key="canvasLocation" x="1220" y="373.76311844077964"/>
         </scene>
         <!--Collection View Controller-->
         <scene sceneID="0FI-p5-L1F">
@@ -305,7 +294,7 @@
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eSE-Ii-0ph">
                                                     <rect key="frame" x="39" y="49.5" width="42" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="textColor" systemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -380,14 +369,14 @@
                                 <color key="sectionIndexBackgroundColor" red="0.75294117647058822" green="0.22352941176470587" blue="0.16862745098039217" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="3Rf-sX-wKj" rowHeight="80" style="IBUITableViewCellStyleDefault" id="JA4-oD-tc1">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="80"/>
+                                        <rect key="frame" x="0.0" y="24.5" width="375" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JA4-oD-tc1" id="Nff-D5-mMj">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="80"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="3Rf-sX-wKj">
-                                                    <rect key="frame" x="15" y="0.0" width="345" height="80"/>
+                                                    <rect key="frame" x="16" y="0.0" width="343" height="80"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="STHeitiSC-Light" family="Heiti SC" pointSize="20"/>
                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -411,7 +400,7 @@
                                 <items>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="O2a-fR-Fq9"/>
                                     <barButtonItem style="plain" id="AZt-Kd-oDi">
-                                        <segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="0XN-Th-jG2">
+                                        <segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="0XN-Th-jG2">
                                             <rect key="frame" x="122" y="6" width="131" height="32"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <segments>
@@ -460,7 +449,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bsw-3h-r3j">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bsw-3h-r3j">
                                 <rect key="frame" x="160.5" y="318.5" width="54" height="30"/>
                                 <state key="normal" title="Dismiss"/>
                                 <connections>
@@ -468,7 +457,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Testing modal controller" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L3p-Hk-xNN">
-                                <rect key="frame" x="95" y="200" width="185" height="21"/>
+                                <rect key="frame" x="96" y="200" width="183.5" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -612,4 +601,12 @@
             <point key="canvasLocation" x="2001" y="1895"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>