From f959fbb09bed7a936afaca1e1504143cd6f63db2 Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Tue, 2 Apr 2024 10:48:06 +1100
Subject: [PATCH 1/9] Xcode and SPM

---
 .../xcshareddata/xcschemes/MiniMap.xcscheme               | 2 +-
 Package.resolved                                          | 8 ++++----
 .../xcshareddata/xcschemes/TripKit-Package.xcscheme       | 2 +-
 .../xcshareddata/xcschemes/TripKit-iOS.xcscheme           | 2 +-
 .../xcshareddata/xcschemes/TripKit-macOS.xcscheme         | 2 +-
 .../xcshareddata/xcschemes/TripKitInterApp-iOS.xcscheme   | 2 +-
 .../xcshareddata/xcschemes/TripKitUI-iOS.xcscheme         | 2 +-
 .../xcshareddata/xcschemes/TripKitUIExample.xcscheme      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Examples/MiniMap/MiniMap.xcodeproj/xcshareddata/xcschemes/MiniMap.xcscheme b/Examples/MiniMap/MiniMap.xcodeproj/xcshareddata/xcschemes/MiniMap.xcscheme
index 4cf66bd43..3c56e620a 100644
--- a/Examples/MiniMap/MiniMap.xcodeproj/xcshareddata/xcschemes/MiniMap.xcscheme
+++ b/Examples/MiniMap/MiniMap.xcodeproj/xcshareddata/xcschemes/MiniMap.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Package.resolved b/Package.resolved
index 2daf89690..80071d624 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/onevcat/Kingfisher.git",
         "state": {
           "branch": null,
-          "revision": "c1f60c63f356d364f4284ba82961acbe7de79bcc",
-          "version": "7.8.1"
+          "revision": "5b92f029fab2cce44386d28588098b5be0824ef5",
+          "version": "7.11.0"
         }
       },
       {
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/skedgo/TGCardViewController.git",
         "state": {
           "branch": null,
-          "revision": "b96668ef9bd28972f75ff9087b822fad8fb0ad84",
-          "version": "2.2.10"
+          "revision": "7b1350d669c6870d7b5cfbcd201d69def3c246d4",
+          "version": "2.2.12"
         }
       }
     ]
diff --git a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-Package.xcscheme b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-Package.xcscheme
index a8d560c97..4c42daffb 100644
--- a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-Package.xcscheme
+++ b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme
index deb66e4cf..77decfda2 100644
--- a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme
+++ b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-macOS.xcscheme b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-macOS.xcscheme
index 5006590ea..6ce2db0d0 100644
--- a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-macOS.xcscheme
+++ b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKit-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitInterApp-iOS.xcscheme b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitInterApp-iOS.xcscheme
index 7e3d4e175..49affe597 100644
--- a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitInterApp-iOS.xcscheme
+++ b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitInterApp-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUI-iOS.xcscheme b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUI-iOS.xcscheme
index 7022fb6a0..239c35f99 100644
--- a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUI-iOS.xcscheme
+++ b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUI-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUIExample.xcscheme b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUIExample.xcscheme
index 2675ec9f4..e27e41e7e 100644
--- a/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUIExample.xcscheme
+++ b/TripKit.xcodeproj/xcshareddata/xcschemes/TripKitUIExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

From 85878ae2688f3639e1f30cec09ab5a65044531d5 Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Tue, 2 Apr 2024 10:58:41 +1100
Subject: [PATCH 2/9] Add TripKitInterApp to SPM

---
 Package.swift | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Package.swift b/Package.swift
index 8f1de29a4..3ddbc5e34 100644
--- a/Package.swift
+++ b/Package.swift
@@ -18,6 +18,9 @@ let package = Package(
     .library(
       name: "TripKitUI",
       targets: ["TripKitUI"]),
+    .library(
+      name: "TripKitInterApp",
+      targets: ["TripKitInterApp"]),
   ],
   dependencies: [
     .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.1.0")),
@@ -42,6 +45,11 @@ let package = Package(
       ],
       exclude: ["Supporting Files/Info.plist", "vendor/RxCombine/LICENSE"]
     ),
+    .target(
+      name: "TripKitInterApp",
+      dependencies: [],
+      exclude: ["Supporting Files/Info.plist"]
+    ),
     .testTarget(
       name: "TripKitTests",
       dependencies: [

From 73af7eb1e809db62b59ffd09eb4cb9f5305b2b78 Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Tue, 2 Apr 2024 11:45:50 +1100
Subject: [PATCH 3/9] Fix issues when using TripKitUI via SPM

- Remove `customModuleProvider="target"` from XIBs
- Use `Bundle.tripKitUI` everywhere
- `Bundle.tripKitUI` maps to `Bundle.module` when using via SPM
---
 Package.swift                                 |  6 ++-
 Sources/TripKitUI/TripKitUIBundle.swift       |  4 ++
 .../controller/TKUIAlertViewController.swift  |  2 +-
 .../TKUISectionedAlertViewController.swift    |  2 +-
 Sources/TripKitUI/views/TKUIDepartureCell.xib | 12 ++---
 .../views/TKUIHomeCustomizerCell.xib          |  6 +--
 .../TripKitUI/views/TKUIModePickerCell.xib    |  6 +--
 Sources/TripKitUI/views/TKUINearbyCell.swift  |  2 +-
 Sources/TripKitUI/views/TKUINearbyCell.xib    |  6 +--
 Sources/TripKitUI/views/TKUITripBoyView.swift |  3 +-
 Sources/TripKitUI/views/TKUITripBoyView.xib   |  6 +--
 .../TripKitUI/views/alerts/TKUIAlertCell.xib  | 32 ++++++-------
 .../views/alerts/TKUIEmptyAlertView.xib       | 10 ++---
 .../views/alerts/TKUIGroupedAlertCell.xib     | 31 +++++++------
 .../views/alerts/TKUILoadingAlertView.xib     | 19 ++++----
 .../alerts/TKUISectionedAlertTableHeader.xib  |  6 +--
 .../views/results/TKUIProgressCell.swift      |  2 +-
 .../views/results/TKUIProgressCell.xib        |  6 +--
 .../results/TKUIResultsAccessoryView.swift    |  3 +-
 .../results/TKUIResultsAccessoryView.xib      |  6 +--
 .../views/results/TKUIResultsTitleView.xib    |  6 +--
 .../TKUIRoutingQueryInputTitleView.xib        |  8 ++--
 .../results/TKUIRoutingSupportView.swift      |  2 +-
 .../views/results/TKUIRoutingSupportView.xib  | 16 +++----
 .../views/results/TKUITripCell.swift          |  2 +-
 .../TripKitUI/views/results/TKUITripCell.xib  |  8 ++--
 .../TKUISegmentDirectionCell.xib              |  6 +--
 .../TKUISegmentInstructionsView.xib           | 14 +++---
 .../segment cards/TKUISegmentTitleView.swift  |  2 +-
 .../segment cards/TKUISegmentTitleView.xib    | 20 ++++-----
 .../timetable/TKUIServiceHeaderMiniView.swift |  2 +-
 .../timetable/TKUIServiceHeaderMiniView.xib   |  2 +-
 .../timetable/TKUIServiceHeaderView.swift     |  2 +-
 .../views/timetable/TKUIServiceHeaderView.xib |  2 +-
 .../timetable/TKUIServiceNumberCell.swift     |  4 +-
 .../views/timetable/TKUIServiceNumberCell.xib |  8 ++--
 .../timetable/TKUIServiceTitleView.swift      |  2 +-
 .../views/timetable/TKUIServiceTitleView.xib  | 12 ++---
 .../timetable/TKUIServiceVisitCell.swift      |  2 +-
 .../views/timetable/TKUIServiceVisitCell.xib  | 16 +++----
 .../TKUITimetableAccessoryView.swift          |  3 +-
 .../timetable/TKUITimetableAccessoryView.xib  | 18 +++++---
 .../trip overview/TKUIAttributionCell.swift   |  2 +-
 .../trip overview/TKUIAttributionCell.xib     | 12 ++---
 .../trip overview/TKUINotificationView.swift  |  6 +--
 .../trip overview/TKUINotificationView.xib    |  6 +--
 .../TKUIPathFriendlinessView.xib              | 45 ++++++++++---------
 .../trip overview/TKUISegmentAlertCell.swift  |  2 +-
 .../trip overview/TKUISegmentAlertCell.xib    | 17 ++++---
 .../TKUISegmentImpossibleCell.swift           |  2 +-
 .../TKUISegmentImpossibleCell.xib             |  8 ++--
 .../trip overview/TKUISegmentMovingCell.swift |  2 +-
 .../trip overview/TKUISegmentMovingCell.xib   |  8 ++--
 .../TKUISegmentStationaryCell.swift           |  2 +-
 .../TKUISegmentStationaryCell.xib             |  6 +--
 .../TKUISegmentStationaryDoubleCell.swift     |  2 +-
 .../TKUISegmentStationaryDoubleCell.xib       | 16 +++----
 .../trip overview/TKUITripTitleView.swift     |  2 +-
 .../views/trip overview/TKUITripTitleView.xib | 18 ++++----
 59 files changed, 249 insertions(+), 234 deletions(-)

diff --git a/Package.swift b/Package.swift
index 3ddbc5e34..13d7a1c9b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -37,7 +37,7 @@ let package = Package(
     .target(
       name: "TripKitUI",
       dependencies: [
-        .target(name: "TripKit"),
+        "TripKit",
         "Kingfisher",
         .product(name: "RxCocoa", package: "RxSwift"),
         "TGCardViewController",
@@ -47,7 +47,9 @@ let package = Package(
     ),
     .target(
       name: "TripKitInterApp",
-      dependencies: [],
+      dependencies: [
+        "TripKit",
+      ],
       exclude: ["Supporting Files/Info.plist"]
     ),
     .testTarget(
diff --git a/Sources/TripKitUI/TripKitUIBundle.swift b/Sources/TripKitUI/TripKitUIBundle.swift
index 16d83a1e7..2a909b1af 100644
--- a/Sources/TripKitUI/TripKitUIBundle.swift
+++ b/Sources/TripKitUI/TripKitUIBundle.swift
@@ -71,7 +71,11 @@ class TripKitUIBundle: NSObject {
   }
   
   fileprivate static func bundle() -> Bundle {
+#if SWIFT_PACKAGE
+    return Bundle.module
+#else
     return Bundle(for: self)
+#endif
   }
   
 }
diff --git a/Sources/TripKitUI/controller/TKUIAlertViewController.swift b/Sources/TripKitUI/controller/TKUIAlertViewController.swift
index 547ab660d..7e9e8af90 100644
--- a/Sources/TripKitUI/controller/TKUIAlertViewController.swift
+++ b/Sources/TripKitUI/controller/TKUIAlertViewController.swift
@@ -103,7 +103,7 @@ public class TKUIAlertViewController: UITableViewController {
     
     tableView.rowHeight = UITableView.automaticDimension
     tableView.estimatedRowHeight = 150
-    tableView.register(UINib(nibName: "TKUIAlertCell", bundle: Bundle(for: TKUIAlertCell.self)), forCellReuseIdentifier: "TKUIAlertCell")
+    tableView.register(UINib(nibName: "TKUIAlertCell", bundle: .tripKitUI), forCellReuseIdentifier: "TKUIAlertCell")
     tableView.backgroundColor = .tkBackgroundGrouped
     tableView.separatorStyle = .none
   }
diff --git a/Sources/TripKitUI/controller/TKUISectionedAlertViewController.swift b/Sources/TripKitUI/controller/TKUISectionedAlertViewController.swift
index 049c86df5..0037213b6 100644
--- a/Sources/TripKitUI/controller/TKUISectionedAlertViewController.swift
+++ b/Sources/TripKitUI/controller/TKUISectionedAlertViewController.swift
@@ -38,7 +38,7 @@ public class TKUISectionedAlertViewController: UIViewController {
   // MARK: - Constructor
   
   public static func newInstance(region: TKRegion) -> TKUISectionedAlertViewController {
-    let controller = TKUISectionedAlertViewController(nibName: "TKUISectionedAlertViewController", bundle: Bundle(for: self))
+    let controller = TKUISectionedAlertViewController(nibName: "TKUISectionedAlertViewController", bundle: .tripKitUI)
     controller.region = region
     return controller
   }
diff --git a/Sources/TripKitUI/views/TKUIDepartureCell.xib b/Sources/TripKitUI/views/TKUIDepartureCell.xib
index f9dc4966a..c911ef13b 100644
--- a/Sources/TripKitUI/views/TKUIDepartureCell.xib
+++ b/Sources/TripKitUI/views/TKUIDepartureCell.xib
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIDepartureCell" rowHeight="96" id="KGk-i7-Jjw" customClass="TKUIDepartureCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIDepartureCell" rowHeight="96" id="KGk-i7-Jjw" customClass="TKUIDepartureCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="435" height="96"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -33,7 +33,7 @@
                                     <view contentMode="scaleToFill" horizontalHuggingPriority="253" verticalHuggingPriority="253" translatesAutoresizingMaskIntoConstraints="NO" id="wWl-tx-YGV">
                                         <rect key="frame" x="24" y="0.0" width="50" height="24"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="E84" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uZ8-Tg-CEt" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="E84" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uZ8-Tg-CEt" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                                 <rect key="frame" x="4" y="0.0" width="42" height="24"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                 <color key="textColor" systemColor="lightTextColor"/>
@@ -67,7 +67,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="YdC-yY-o8m">
                                 <rect key="frame" x="0.0" y="26" width="145.5" height="20"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" verticalCompressionResistancePriority="751" text="On time · 3:35pm" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NG5-pD-VCL" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" verticalCompressionResistancePriority="751" text="On time · 3:35pm" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NG5-pD-VCL" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                         <rect key="frame" x="0.0" y="2" width="105.5" height="16"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                         <color key="textColor" systemColor="darkTextColor"/>
@@ -89,7 +89,7 @@
                                     </imageView>
                                 </subviews>
                             </stackView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Stand C · Mona Vale Junction" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yLh-U7-4mz" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Stand C · Mona Vale Junction" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yLh-U7-4mz" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                 <rect key="frame" x="0.0" y="48" width="178" height="16"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <color key="textColor" systemColor="darkTextColor"/>
@@ -100,13 +100,13 @@
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="iaM-1r-elk">
                         <rect key="frame" x="375" y="30" width="40" height="36.5"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Now" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yhb-5V-Syb" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Now" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yhb-5V-Syb" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                 <rect key="frame" x="3" y="0.0" width="34.5" height="20.5"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <color key="textColor" systemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WIX-KC-bMq" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WIX-KC-bMq" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                 <rect key="frame" x="3.5" y="20.5" width="33" height="16"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <color key="textColor" systemColor="darkTextColor"/>
diff --git a/Sources/TripKitUI/views/TKUIHomeCustomizerCell.xib b/Sources/TripKitUI/views/TKUIHomeCustomizerCell.xib
index f473159e4..46f52e96c 100644
--- a/Sources/TripKitUI/views/TKUIHomeCustomizerCell.xib
+++ b/Sources/TripKitUI/views/TKUIHomeCustomizerCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIHomeCustomizerCell" id="KGk-i7-Jjw" customClass="TKUIHomeCustomizerCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIHomeCustomizerCell" id="KGk-i7-Jjw" customClass="TKUIHomeCustomizerCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
diff --git a/Sources/TripKitUI/views/TKUIModePickerCell.xib b/Sources/TripKitUI/views/TKUIModePickerCell.xib
index 271a12d6a..30d950083 100644
--- a/Sources/TripKitUI/views/TKUIModePickerCell.xib
+++ b/Sources/TripKitUI/views/TKUIModePickerCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,7 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="TKUIModePickerCell" id="gTV-IL-0wX" customClass="TKUIModePickerCell" customModule="TripKitUI" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="TKUIModePickerCell" id="gTV-IL-0wX" customClass="TKUIModePickerCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="80" height="40"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
diff --git a/Sources/TripKitUI/views/TKUINearbyCell.swift b/Sources/TripKitUI/views/TKUINearbyCell.swift
index b1f404a38..0fe6a577e 100644
--- a/Sources/TripKitUI/views/TKUINearbyCell.swift
+++ b/Sources/TripKitUI/views/TKUINearbyCell.swift
@@ -31,7 +31,7 @@ public class TKUINearbyCell: UITableViewCell {
   }
   
   public static var nib: UINib {
-    return UINib(nibName: "TKUINearbyCell", bundle: Bundle(for: TKUINearbyCell.self))
+    return UINib(nibName: "TKUINearbyCell", bundle: .tripKitUI)
   }
   
   public override func awakeFromNib() {
diff --git a/Sources/TripKitUI/views/TKUINearbyCell.xib b/Sources/TripKitUI/views/TKUINearbyCell.xib
index 1eb28323f..cd3f7ea35 100644
--- a/Sources/TripKitUI/views/TKUINearbyCell.xib
+++ b/Sources/TripKitUI/views/TKUINearbyCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUINearbyCell" rowHeight="78" id="KGk-i7-Jjw" customClass="TKUINearbyCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUINearbyCell" rowHeight="78" id="KGk-i7-Jjw" customClass="TKUINearbyCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="331" height="78"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
diff --git a/Sources/TripKitUI/views/TKUITripBoyView.swift b/Sources/TripKitUI/views/TKUITripBoyView.swift
index 707fb3038..2800cb606 100644
--- a/Sources/TripKitUI/views/TKUITripBoyView.swift
+++ b/Sources/TripKitUI/views/TKUITripBoyView.swift
@@ -17,8 +17,7 @@ public class TKUITripBoyView: UIView {
   @IBOutlet public weak var retryButton: UIButton!
   
   public static func newInstance() -> TKUITripBoyView {
-    let view = Bundle(for: self).loadNibNamed("TKUITripBoyView", owner: self, options: nil)?.first as! TKUITripBoyView
-    return view
+    return Bundle.tripKitUI.loadNibNamed("TKUITripBoyView", owner: self, options: nil)?.first as! TKUITripBoyView
   }
 
   public func configure(title: String?, description: String?, actionTitle: String?, isHappy: Bool, allowRetry: Bool) {
diff --git a/Sources/TripKitUI/views/TKUITripBoyView.xib b/Sources/TripKitUI/views/TKUITripBoyView.xib
index 76afbf953..f1ff9c4ee 100644
--- a/Sources/TripKitUI/views/TKUITripBoyView.xib
+++ b/Sources/TripKitUI/views/TKUITripBoyView.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <view contentMode="scaleToFill" id="60J-df-xWy" customClass="TKUITripBoyView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="60J-df-xWy" customClass="TKUITripBoyView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/alerts/TKUIAlertCell.xib b/Sources/TripKitUI/views/alerts/TKUIAlertCell.xib
index 1754ce5b0..6eb6c2ec0 100644
--- a/Sources/TripKitUI/views/alerts/TKUIAlertCell.xib
+++ b/Sources/TripKitUI/views/alerts/TKUIAlertCell.xib
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUIAlertCell" rowHeight="479" id="KGk-i7-Jjw" customClass="TKUIAlertCell" customModule="TripKitUI" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="443"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUIAlertCell" rowHeight="478" id="KGk-i7-Jjw" customClass="TKUIAlertCell" customModule="TripKitUI">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="442"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="443"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="442"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cag-qT-KSE" userLabel="Content wrapper">
-                        <rect key="frame" x="15" y="11" width="290" height="421"/>
+                        <rect key="frame" x="16" y="11" width="288" height="420"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="wyp-Ab-KnI" userLabel="Title stack">
-                                <rect key="frame" x="16" y="16" width="258" height="48"/>
+                                <rect key="frame" x="16" y="16" width="256" height="48"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-alert-red-high-res" translatesAutoresizingMaskIntoConstraints="NO" id="iQN-Tf-VMq">
                                         <rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
@@ -31,7 +31,7 @@
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UDA-Hw-UdL">
-                                        <rect key="frame" x="56" y="12" width="202" height="24"/>
+                                        <rect key="frame" x="56" y="11" width="200" height="26.5"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -39,7 +39,7 @@
                                 </subviews>
                             </stackView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="75u-0W-G0x" userLabel="Separator">
-                                <rect key="frame" x="16" y="76" width="274" height="1"/>
+                                <rect key="frame" x="16" y="76" width="272" height="1"/>
                                 <color key="backgroundColor" white="0.88363626700680276" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="1" id="aJ0-D1-5JB"/>
@@ -47,10 +47,10 @@
                                 </constraints>
                             </view>
                             <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MlA-Dk-Z9D" userLabel="Start date stack">
-                                <rect key="frame" x="16" y="93" width="145" height="16"/>
+                                <rect key="frame" x="16" y="93" width="144.5" height="16"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="ADDED: 8 MARCH 2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pLc-At-4gH">
-                                        <rect key="frame" x="0.0" y="0.0" width="145" height="16"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="144.5" height="16"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
@@ -58,21 +58,21 @@
                                 </subviews>
                             </stackView>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" scrollEnabled="NO" editable="NO" textAlignment="natural" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kBz-eX-YqW">
-                                <rect key="frame" x="16" y="117" width="258" height="233.5"/>
+                                <rect key="frame" x="16" y="117" width="256" height="233.5"/>
                                 <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="4oq-hJ-3Zs" userLabel="Action stack">
-                                <rect key="frame" x="16" y="397" width="258" height="16"/>
+                                <rect key="frame" x="16" y="396" width="256" height="16"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3eZ-gI-hGk">
+                                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3eZ-gI-hGk">
                                         <rect key="frame" x="0.0" y="0.0" width="77" height="16"/>
                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                                         <state key="normal" title="Read more"/>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Last updated" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZo-Fh-5Y5">
-                                        <rect key="frame" x="85" y="0.0" width="173" height="16"/>
+                                        <rect key="frame" x="85" y="0.0" width="171" height="16"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
@@ -120,7 +120,7 @@
                 <outlet property="textView" destination="kBz-eX-YqW" id="XIJ-WW-zcV"/>
                 <outlet property="titleLabel" destination="UDA-Hw-UdL" id="J9T-sO-zr0"/>
             </connections>
-            <point key="canvasLocation" x="-35.200000000000003" y="38.23088455772114"/>
+            <point key="canvasLocation" x="-35.200000000000003" y="37.781109445277366"/>
         </tableViewCell>
     </objects>
     <resources>
diff --git a/Sources/TripKitUI/views/alerts/TKUIEmptyAlertView.xib b/Sources/TripKitUI/views/alerts/TKUIEmptyAlertView.xib
index 680ed792c..984c41f21 100644
--- a/Sources/TripKitUI/views/alerts/TKUIEmptyAlertView.xib
+++ b/Sources/TripKitUI/views/alerts/TKUIEmptyAlertView.xib
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIEmptyAlertView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIEmptyAlertView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/alerts/TKUIGroupedAlertCell.xib b/Sources/TripKitUI/views/alerts/TKUIGroupedAlertCell.xib
index 4d9c42903..444960da6 100644
--- a/Sources/TripKitUI/views/alerts/TKUIGroupedAlertCell.xib
+++ b/Sources/TripKitUI/views/alerts/TKUIGroupedAlertCell.xib
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="TKUIGroupedAlertCell" rowHeight="69" id="KGk-i7-Jjw" customClass="TKUIGroupedAlertCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="TKUIGroupedAlertCell" rowHeight="69" id="KGk-i7-Jjw" customClass="TKUIGroupedAlertCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="386" height="69"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="348" height="68.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="359.5" height="69"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" placeholderIntrinsicWidth="386" placeholderIntrinsicHeight="50" translatesAutoresizingMaskIntoConstraints="NO" id="lKJ-xp-nwZ">
-                        <rect key="frame" x="0.0" y="0.0" width="348" height="68.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="359.5" height="69"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="wyr-ab-1aU">
-                                <rect key="frame" x="16" y="16" width="332" height="36.5"/>
+                                <rect key="frame" x="16" y="16" width="343.5" height="37"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Onh-tk-rUZ">
                                         <rect key="frame" x="0.0" y="1.5" width="30" height="34"/>
@@ -45,7 +43,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="fEH-Zk-tR6">
-                                        <rect key="frame" x="38" y="0.0" width="294" height="36.5"/>
+                                        <rect key="frame" x="38" y="0.5" width="305.5" height="36.5"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="Ql5-AN-CbE">
                                                 <rect key="frame" x="0.0" y="0.0" width="47" height="36.5"/>
@@ -53,19 +51,19 @@
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="T8" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IZK-He-Yhl">
                                                         <rect key="frame" x="0.0" y="0.0" width="21" height="20.5"/>
                                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                        <color key="textColor" systemColor="darkTextColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GhE-8m-KFF">
                                                         <rect key="frame" x="0.0" y="20.5" width="47" height="16"/>
                                                         <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
-                                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                        <color key="textColor" systemColor="darkTextColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
                                             </stackView>
                                             <view contentMode="scaleToFill" placeholderIntrinsicWidth="25" placeholderIntrinsicHeight="25" translatesAutoresizingMaskIntoConstraints="NO" id="N7j-rn-hWb">
-                                                <rect key="frame" x="269" y="6" width="25" height="25"/>
+                                                <rect key="frame" x="280.5" y="5.5" width="25" height="25"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="10" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Qi-yf-oPN">
                                                         <rect key="frame" x="4.5" y="3.5" width="16" height="18"/>
@@ -106,8 +104,8 @@
                     <constraint firstAttribute="bottom" secondItem="lKJ-xp-nwZ" secondAttribute="bottom" id="ygd-ga-TAB"/>
                 </constraints>
             </tableViewCellContentView>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="alertCountLabel" destination="1Qi-yf-oPN" id="Jvc-E6-Lb4"/>
                 <outlet property="alertCountWrapper" destination="N7j-rn-hWb" id="rGK-LP-cIk"/>
@@ -120,4 +118,9 @@
             <point key="canvasLocation" x="-453" y="-281.5"/>
         </tableViewCell>
     </objects>
+    <resources>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Sources/TripKitUI/views/alerts/TKUILoadingAlertView.xib b/Sources/TripKitUI/views/alerts/TKUILoadingAlertView.xib
index 18bb1b455..be8856839 100644
--- a/Sources/TripKitUI/views/alerts/TKUILoadingAlertView.xib
+++ b/Sources/TripKitUI/views/alerts/TKUILoadingAlertView.xib
@@ -1,46 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUILoadingAlertView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUILoadingAlertView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="QKv-Tq-Hqh">
-                    <rect key="frame" x="83" y="84" width="209" height="20.5"/>
+                    <rect key="frame" x="83.5" y="84" width="208" height="20.5"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Checking for new alerts" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DJx-Ca-zBq">
-                            <rect key="frame" x="0.0" y="0.0" width="181" height="20.5"/>
+                            <rect key="frame" x="0.0" y="0.0" width="180" height="20.5"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="ww8-W4-YIO">
-                            <rect key="frame" x="189" y="0.5" width="20" height="20"/>
+                            <rect key="frame" x="188" y="0.5" width="20" height="20"/>
                         </activityIndicatorView>
                     </subviews>
                 </stackView>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="QKv-Tq-Hqh" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="mAo-67-kXp"/>
                 <constraint firstItem="QKv-Tq-Hqh" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="64" id="qS7-LN-znK"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="spinner" destination="ww8-W4-YIO" id="haY-qO-Ig3"/>
                 <outlet property="textLabel" destination="DJx-Ca-zBq" id="phf-xQ-8Kc"/>
             </connections>
+            <point key="canvasLocation" x="-100" y="-2"/>
         </view>
     </objects>
 </document>
diff --git a/Sources/TripKitUI/views/alerts/TKUISectionedAlertTableHeader.xib b/Sources/TripKitUI/views/alerts/TKUISectionedAlertTableHeader.xib
index 612225a37..6ae3f7a61 100644
--- a/Sources/TripKitUI/views/alerts/TKUISectionedAlertTableHeader.xib
+++ b/Sources/TripKitUI/views/alerts/TKUISectionedAlertTableHeader.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="GKW-hz-uaT" customClass="TKUISectionedAlertTableHeader" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="GKW-hz-uaT" customClass="TKUISectionedAlertTableHeader" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="46"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/results/TKUIProgressCell.swift b/Sources/TripKitUI/views/results/TKUIProgressCell.swift
index 84ae165ac..90f8e28b9 100644
--- a/Sources/TripKitUI/views/results/TKUIProgressCell.swift
+++ b/Sources/TripKitUI/views/results/TKUIProgressCell.swift
@@ -15,7 +15,7 @@ public class TKUIProgressCell: UITableViewCell {
   @IBOutlet weak var spinner: UIActivityIndicatorView!
   @IBOutlet weak var titleLabel: UILabel!
   
-  public static let nib = UINib(nibName: "TKUIProgressCell", bundle: Bundle(for: TKUIProgressCell.self))
+  public static let nib = UINib(nibName: "TKUIProgressCell", bundle: .tripKitUI)
   
   public static let reuseIdentifier: String = "TKUIProgressCell"
 
diff --git a/Sources/TripKitUI/views/results/TKUIProgressCell.xib b/Sources/TripKitUI/views/results/TKUIProgressCell.xib
index ba96ef06d..36f87dace 100644
--- a/Sources/TripKitUI/views/results/TKUIProgressCell.xib
+++ b/Sources/TripKitUI/views/results/TKUIProgressCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUIProgressCell" rowHeight="62" id="KGk-i7-Jjw" customClass="TKUIProgressCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUIProgressCell" rowHeight="62" id="KGk-i7-Jjw" customClass="TKUIProgressCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="62"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
diff --git a/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.swift b/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.swift
index e199ccea9..d5ebcb54b 100644
--- a/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.swift
+++ b/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.swift
@@ -22,9 +22,8 @@ class TKUIResultsAccessoryView: UIView {
   @IBOutlet var bottomConstraint: NSLayoutConstraint!
   
   static func instantiate() -> TKUIResultsAccessoryView {
-    let bundle = Bundle(for: self)
     guard
-      let view = bundle.loadNibNamed("TKUIResultsAccessoryView", owner: nil, options: nil)!.first as? TKUIResultsAccessoryView
+      let view = Bundle.tripKitUI.loadNibNamed("TKUIResultsAccessoryView", owner: nil, options: nil)!.first as? TKUIResultsAccessoryView
       else { preconditionFailure() }
     return view
   }
diff --git a/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.xib b/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.xib
index 53abf9b16..4f11e074f 100644
--- a/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.xib
+++ b/Sources/TripKitUI/views/results/TKUIResultsAccessoryView.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIResultsAccessoryView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIResultsAccessoryView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/results/TKUIResultsTitleView.xib b/Sources/TripKitUI/views/results/TKUIResultsTitleView.xib
index 89354ff94..ea6f3b0af 100644
--- a/Sources/TripKitUI/views/results/TKUIResultsTitleView.xib
+++ b/Sources/TripKitUI/views/results/TKUIResultsTitleView.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="tl6-Gv-m1x" customClass="TKUIResultsTitleView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="tl6-Gv-m1x" customClass="TKUIResultsTitleView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="117"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/results/TKUIRoutingQueryInputTitleView.xib b/Sources/TripKitUI/views/results/TKUIRoutingQueryInputTitleView.xib
index 9ffcbdfe0..3153d9120 100644
--- a/Sources/TripKitUI/views/results/TKUIRoutingQueryInputTitleView.xib
+++ b/Sources/TripKitUI/views/results/TKUIRoutingQueryInputTitleView.xib
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <accessibilityOverrides isEnabled="YES" dynamicTypePreference="5"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,7 +12,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIRoutingQueryInputTitleView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIRoutingQueryInputTitleView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="355" height="248"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -135,8 +135,8 @@
                         <mask key="constraints">
                             <exclude reference="vSg-DZ-dEb"/>
                             <exclude reference="2IL-p6-Cjy"/>
-                            <exclude reference="4Qo-jb-06X"/>
                             <exclude reference="me7-4R-qf8"/>
+                            <exclude reference="4Qo-jb-06X"/>
                             <exclude reference="Fww-S8-vlF"/>
                         </mask>
                     </variation>
diff --git a/Sources/TripKitUI/views/results/TKUIRoutingSupportView.swift b/Sources/TripKitUI/views/results/TKUIRoutingSupportView.swift
index 3fb2c1477..83c8c3fe4 100644
--- a/Sources/TripKitUI/views/results/TKUIRoutingSupportView.swift
+++ b/Sources/TripKitUI/views/results/TKUIRoutingSupportView.swift
@@ -23,7 +23,7 @@ class TKUIRoutingSupportView: UIView {
   // MARK: - Factory
   
   static func makeView(with message: NSAttributedString, allowRoutingRequest: Bool) -> TKUIRoutingSupportView {
-    guard let supportView = Bundle(for: self).loadNibNamed(String(describing: self), owner: self, options: nil)?.first as? TKUIRoutingSupportView else {
+    guard let supportView = Bundle.tripKitUI.loadNibNamed(String(describing: self), owner: self, options: nil)?.first as? TKUIRoutingSupportView else {
       preconditionFailure("Unable to load view from nib")
     }
     
diff --git a/Sources/TripKitUI/views/results/TKUIRoutingSupportView.xib b/Sources/TripKitUI/views/results/TKUIRoutingSupportView.xib
index 239f2411a..364619d3e 100644
--- a/Sources/TripKitUI/views/results/TKUIRoutingSupportView.xib
+++ b/Sources/TripKitUI/views/results/TKUIRoutingSupportView.xib
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_0" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIRoutingSupportView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIRoutingSupportView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -22,7 +20,7 @@
                         <constraint firstAttribute="width" constant="240" id="bkc-cj-QmO"/>
                     </constraints>
                 </imageView>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6oq-UB-fuX">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6oq-UB-fuX">
                     <rect key="frame" x="35" y="324.5" width="250" height="45"/>
                     <constraints>
                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="IhA-8v-WYX"/>
@@ -32,8 +30,8 @@
                     <inset key="contentEdgeInsets" minX="8" minY="8" maxX="8" maxY="8"/>
                     <state key="normal" title="#REQUEST SUPPORT"/>
                 </button>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qhz-mr-0mP">
-                    <rect key="frame" x="95" y="399.5" width="130" height="33"/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qhz-mr-0mP">
+                    <rect key="frame" x="95.5" y="399.5" width="129" height="33"/>
                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                     <state key="normal" title="PLAN NEW TRIP"/>
                 </button>
diff --git a/Sources/TripKitUI/views/results/TKUITripCell.swift b/Sources/TripKitUI/views/results/TKUITripCell.swift
index cf9d9468c..99d6e0617 100644
--- a/Sources/TripKitUI/views/results/TKUITripCell.swift
+++ b/Sources/TripKitUI/views/results/TKUITripCell.swift
@@ -12,7 +12,7 @@ import TripKit
 
 public class TKUITripCell: UITableViewCell {
 
-  public static let nib = UINib(nibName: "TKUITripCell", bundle: Bundle(for: TKUITripCell.self))
+  public static let nib = UINib(nibName: "TKUITripCell", bundle: .tripKitUI)
   
   public static let reuseIdentifier: String = "TKUITripCell"
 
diff --git a/Sources/TripKitUI/views/results/TKUITripCell.xib b/Sources/TripKitUI/views/results/TKUITripCell.xib
index f9976c3e4..4031a03e1 100644
--- a/Sources/TripKitUI/views/results/TKUITripCell.xib
+++ b/Sources/TripKitUI/views/results/TKUITripCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,7 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUITripCell" rowHeight="137" id="KGk-i7-Jjw" customClass="TKUITripCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUITripCell" rowHeight="137" id="KGk-i7-Jjw" customClass="TKUITripCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="137"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -42,7 +42,7 @@
                             </label>
                         </subviews>
                     </stackView>
-                    <view contentMode="scaleToFill" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="y8N-RR-3eg" customClass="TKUITripSegmentsView" customModule="TripKitUI" customModuleProvider="target">
+                    <view contentMode="scaleToFill" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="y8N-RR-3eg" customClass="TKUITripSegmentsView" customModule="TripKitUI">
                         <rect key="frame" x="16" y="39.5" width="288" height="40"/>
                         <constraints>
                             <constraint firstAttribute="height" priority="999" constant="40" id="7cL-bg-n3k"/>
diff --git a/Sources/TripKitUI/views/segment cards/TKUISegmentDirectionCell.xib b/Sources/TripKitUI/views/segment cards/TKUISegmentDirectionCell.xib
index 9c09c5a0d..e6e9b7110 100644
--- a/Sources/TripKitUI/views/segment cards/TKUISegmentDirectionCell.xib	
+++ b/Sources/TripKitUI/views/segment cards/TKUISegmentDirectionCell.xib	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentDirectionCell" rowHeight="74" id="KGk-i7-Jjw" customClass="TKUISegmentDirectionCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentDirectionCell" rowHeight="74" id="KGk-i7-Jjw" customClass="TKUISegmentDirectionCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="74"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
diff --git a/Sources/TripKitUI/views/segment cards/TKUISegmentInstructionsView.xib b/Sources/TripKitUI/views/segment cards/TKUISegmentInstructionsView.xib
index 1525387c2..3580fa725 100644
--- a/Sources/TripKitUI/views/segment cards/TKUISegmentInstructionsView.xib	
+++ b/Sources/TripKitUI/views/segment cards/TKUISegmentInstructionsView.xib	
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUISegmentInstructionsView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUISegmentInstructionsView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="128"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="q40-ct-EgY">
-                    <rect key="frame" x="16" y="0.0" width="343" height="78.5"/>
+                    <rect key="frame" x="16" y="20" width="343" height="78.5"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="50" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="hjh-HL-cum">
                             <rect key="frame" x="0.0" y="0.0" width="343" height="50"/>
@@ -31,6 +29,7 @@
                     </subviews>
                 </stackView>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="q40-ct-EgY" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="16" id="2im-hd-mSc"/>
@@ -39,7 +38,6 @@
                 <constraint firstItem="q40-ct-EgY" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="czO-lU-1Cg"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="accessoryStackView" destination="hjh-HL-cum" id="8lX-b7-woe"/>
                 <outlet property="notesLabel" destination="hZ0-NF-QYG" id="7Lx-9P-Li5"/>
diff --git a/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.swift b/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.swift
index fa5e7855b..4f9e54894 100644
--- a/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.swift	
+++ b/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.swift	
@@ -38,7 +38,7 @@ public class TKUISegmentTitleView: UIView, TGPreferrableView {
   var disposeBag: DisposeBag!
   
   public static func newInstance() -> TKUISegmentTitleView {
-    return Bundle(for: TKUISegmentTitleView.self).loadNibNamed("TKUISegmentTitleView", owner: self, options: nil)?.first as! TKUISegmentTitleView
+    return Bundle.tripKitUI.loadNibNamed("TKUISegmentTitleView", owner: self, options: nil)?.first as! TKUISegmentTitleView
   }
   
   public override func awakeFromNib() {
diff --git a/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.xib b/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.xib
index 4860d30c7..9ee3190bd 100644
--- a/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.xib	
+++ b/Sources/TripKitUI/views/segment cards/TKUISegmentTitleView.xib	
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="VGo-lB-GoV" customClass="TKUISegmentTitleView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="VGo-lB-GoV" customClass="TKUISegmentTitleView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="157"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
@@ -39,22 +39,22 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="25R-dz-Nwr">
-                    <rect key="frame" x="64" y="8" width="101.5" height="50.5"/>
+                    <rect key="frame" x="64" y="8" width="109.5" height="50.5"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" verticalCompressionResistancePriority="751" text="Walk" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wEO-Bf-P7i" userLabel="Title" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="0.0" width="101.5" height="23.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" verticalCompressionResistancePriority="751" text="Walk" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wEO-Bf-P7i" userLabel="Title" customClass="TKUIStyledLabel" customModule="TripKitUI">
+                            <rect key="frame" x="0.0" y="0.0" width="109.5" height="21.5"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                             <color key="textColor" red="0.097280979160000003" green="0.090294875199999999" blue="0.23543129860000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Towards Mona Vale" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ccR-Sw-Z6F" userLabel="Subtitle" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="23.5" width="101.5" height="13.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Towards Mona Vale" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ccR-Sw-Z6F" userLabel="Subtitle" customClass="TKUIStyledLabel" customModule="TripKitUI">
+                            <rect key="frame" x="0.0" y="21.5" width="109.5" height="14.5"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                             <color key="textColor" red="0.4549019608" green="0.4549019608" blue="0.4549019608" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LXs-Kz-Uqb" userLabel="Subsubtitle" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="37" width="101.5" height="13.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LXs-Kz-Uqb" userLabel="Subsubtitle" customClass="TKUIStyledLabel" customModule="TripKitUI">
+                            <rect key="frame" x="0.0" y="36" width="109.5" height="14.5"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                             <color key="textColor" red="0.70196078429999997" green="0.70196078429999997" blue="0.70196078429999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.swift b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.swift
index 907689b7f..2f504df27 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.swift
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.swift
@@ -25,7 +25,7 @@ class TKUIServiceHeaderMiniView: UIView {
   private var disposeBag = DisposeBag()
   
   static func newInstance() -> TKUIServiceHeaderMiniView {
-    return Bundle(for: TKUIServiceHeaderMiniView.self).loadNibNamed("TKUIServiceHeaderMiniView", owner: self, options: nil)?.first as! TKUIServiceHeaderMiniView
+    return Bundle.tripKitUI.loadNibNamed("TKUIServiceHeaderMiniView", owner: self, options: nil)?.first as! TKUIServiceHeaderMiniView
   }
   
   override func awakeFromNib() {
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.xib b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.xib
index a3fe576e9..1c42ac3d2 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.xib
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderMiniView.xib
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIServiceHeaderMiniView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIServiceHeaderMiniView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="414" height="54"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.swift b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.swift
index e5614f73b..fba03b9f2 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.swift
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.swift
@@ -49,7 +49,7 @@ class TKUIServiceHeaderView: UIView {
   }
   
   static func newInstance() -> TKUIServiceHeaderView {
-    return Bundle(for: TKUIServiceHeaderView.self).loadNibNamed("TKUIServiceHeaderView", owner: self, options: nil)?.first as! TKUIServiceHeaderView
+    return Bundle.tripKitUI.loadNibNamed("TKUIServiceHeaderView", owner: self, options: nil)?.first as! TKUIServiceHeaderView
   }
   
   override func awakeFromNib() {
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib
index fd61fef4e..9da597fba 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIServiceHeaderView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIServiceHeaderView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="414" height="324"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.swift b/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.swift
index dea8f60e9..8d1d66840 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.swift
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.swift
@@ -12,10 +12,10 @@ class TKUIServiceNumberCell: UICollectionViewCell {
 
   static let reuseIdentifier: String = "TKUIServiceNumberCell"
   
-  static let nib = UINib(nibName: "TKUIServiceNumberCell", bundle: Bundle(for: TKUIServiceNumberCell.self))
+  static let nib = UINib(nibName: "TKUIServiceNumberCell", bundle: .tripKitUI)
   
   static func newInstance() -> TKUIServiceNumberCell {
-    return Bundle(for: self).loadNibNamed("TKUIServiceNumberCell", owner: self, options: nil)?.first as! TKUIServiceNumberCell
+    return Bundle.tripKitUI.loadNibNamed("TKUIServiceNumberCell", owner: self, options: nil)?.first as! TKUIServiceNumberCell
   }
 
   @IBOutlet weak var wrapperView: UIView!
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.xib b/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.xib
index 350a7f369..ec1076520 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.xib
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceNumberCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="collection view cell content view" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Rdk-RH-sIm" customClass="TKUIServiceNumberCell" customModule="TripKitUI" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="Rdk-RH-sIm" customClass="TKUIServiceNumberCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="88" height="26"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="iq3-3v-b0f">
@@ -20,7 +20,7 @@
                     <view contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lee-oU-wfS">
                         <rect key="frame" x="0.0" y="0.0" width="88" height="26"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="750" text="E84" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KzG-Zs-LWc" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="750" text="E84" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KzG-Zs-LWc" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                 <rect key="frame" x="4" y="0.0" width="80" height="26"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <color key="textColor" systemColor="lightTextColor"/>
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.swift b/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.swift
index 61f872321..72485f4a4 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.swift
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.swift
@@ -27,7 +27,7 @@ class TKUIServiceTitleView: UIView {
   @IBOutlet weak var accessoryStack: UIStackView!
   
   static func newInstance() -> TKUIServiceTitleView {
-    return Bundle(for: TKUIServiceTitleView.self).loadNibNamed("TKUIServiceTitleView", owner: self, options: nil)?.first as! TKUIServiceTitleView
+    return Bundle.tripKitUI.loadNibNamed("TKUIServiceTitleView", owner: self, options: nil)?.first as! TKUIServiceTitleView
   }
   
   override func awakeFromNib() {
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib b/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib
index 590203787..8ee8bb0ff 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="VGo-lB-GoV" customClass="TKUIServiceTitleView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="VGo-lB-GoV" customClass="TKUIServiceTitleView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="372" height="118"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="25R-dz-Nwr">
                     <rect key="frame" x="16" y="8" width="302" height="84.5"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" verticalCompressionResistancePriority="751" text="E84 at 3:35pm" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wEO-Bf-P7i" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" verticalCompressionResistancePriority="751" text="E84 at 3:35pm" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wEO-Bf-P7i" customClass="TKUIStyledLabel" customModule="TripKitUI">
                             <rect key="frame" x="0.0" y="0.0" width="143" height="26.5"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
                             <color key="textColor" red="0.097280979160000003" green="0.090294875199999999" blue="0.23543129860000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -56,7 +56,7 @@
                                         </userDefinedRuntimeAttribute>
                                     </userDefinedRuntimeAttributes>
                                 </view>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="751" text="Stand C, Mona vale Junction" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ccR-Sw-Z6F" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="751" text="Stand C, Mona vale Junction" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ccR-Sw-Z6F" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                     <rect key="frame" x="64.5" y="3" width="195.5" height="18"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                     <color key="textColor" red="0.4549019608" green="0.4549019608" blue="0.4549019608" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -64,7 +64,7 @@
                                 </label>
                             </subviews>
                         </stackView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="psb-f5-aiV" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="psb-f5-aiV" customClass="TKUIStyledLabel" customModule="TripKitUI">
                             <rect key="frame" x="0.0" y="66.5" width="37.5" height="18"/>
                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                             <color key="textColor" name="TKLabelSecondary"/>
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.swift b/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.swift
index 1bdd86f0a..7c8ee3a1f 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.swift
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.swift
@@ -31,7 +31,7 @@ class TKUIServiceVisitCell: UITableViewCell {
   @IBOutlet weak var outerDot: UIView!
   @IBOutlet weak var innerDot: UIView!
   
-  static let nib = UINib(nibName: "TKUIServiceVisitCell", bundle: Bundle(for: TKUIServiceVisitCell.self))
+  static let nib = UINib(nibName: "TKUIServiceVisitCell", bundle: .tripKitUI)
   
   static let reuseIdentifier = "TKUIServiceVisitCell"
   
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.xib b/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.xib
index 53185283f..644405d45 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.xib
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceVisitCell.xib
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIServiceVisitCell" rowHeight="96" id="LFq-u7-N6v" customClass="TKUIServiceVisitCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIServiceVisitCell" rowHeight="96" id="LFq-u7-N6v" customClass="TKUIServiceVisitCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="96"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LFq-u7-N6v" id="bB0-6F-0Da">
@@ -20,13 +20,13 @@
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" alignment="bottom" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="XoJ-68-LhB">
                         <rect key="frame" x="0.0" y="30" width="64" height="36"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="hh:mm" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RQV-ez-Gua" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="hh:mm" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RQV-ez-Gua" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                 <rect key="frame" x="22.5" y="0.0" width="41.5" height="16"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="252" horizontalCompressionResistancePriority="751" text="hh:mm" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3g-Lp-l6F" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="252" horizontalCompressionResistancePriority="751" text="hh:mm" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3g-Lp-l6F" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                 <rect key="frame" x="22.5" y="20" width="41.5" height="16"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                 <nil key="textColor"/>
@@ -115,13 +115,13 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="6OM-u4-mGs">
                                 <rect key="frame" x="0.0" y="0.0" width="200" height="80"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="752" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tCk-5A-0sP" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="752" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tCk-5A-0sP" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                         <rect key="frame" x="0.0" y="0.0" width="200" height="20.5"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QK1-pn-5ZP" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QK1-pn-5ZP" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                         <rect key="frame" x="0.0" y="22.5" width="200" height="20.5"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                         <nil key="textColor"/>
@@ -137,7 +137,7 @@
                                                     <constraint firstAttribute="height" constant="16" id="j5Z-1D-e8f"/>
                                                 </constraints>
                                             </imageView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ybG-5j-Cyf" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ybG-5j-Cyf" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                                 <rect key="frame" x="24" y="9.5" width="176" height="16"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                 <nil key="textColor"/>
diff --git a/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.swift b/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.swift
index e45713bdd..0b5a30a3b 100644
--- a/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.swift
+++ b/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.swift
@@ -47,9 +47,8 @@ class TKUITimetableAccessoryView: UIView {
   private var sizingCell: TKUIServiceNumberCell!
   
   static func newInstance() -> TKUITimetableAccessoryView {
-    let bundle = Bundle(for: self)
     guard
-      let view = bundle.loadNibNamed("TKUITimetableAccessoryView", owner: nil, options: nil)!.first as? TKUITimetableAccessoryView
+      let view = Bundle.tripKitUI.loadNibNamed("TKUITimetableAccessoryView", owner: nil, options: nil)!.first as? TKUITimetableAccessoryView
       else { preconditionFailure() }
     return view
   }
diff --git a/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.xib b/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.xib
index 44d0dd508..153013114 100644
--- a/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.xib
+++ b/Sources/TripKitUI/views/timetable/TKUITimetableAccessoryView.xib
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUITimetableAccessoryView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUITimetableAccessoryView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="124"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -19,7 +20,7 @@
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="Sy2-ru-RmS"/>
                     </constraints>
-                    <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="4" minimumInteritemSpacing="4" id="SrO-do-0bT" customClass="TKUICollectionViewBubbleLayout" customModule="TripKitUI" customModuleProvider="target">
+                    <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="4" minimumInteritemSpacing="4" id="SrO-do-0bT" customClass="TKUICollectionViewBubbleLayout" customModule="TripKitUI">
                         <size key="itemSize" width="50" height="50"/>
                         <size key="headerReferenceSize" width="0.0" height="0.0"/>
                         <size key="footerReferenceSize" width="0.0" height="0.0"/>
@@ -36,12 +37,12 @@
                             </constraints>
                             <textInputTraits key="textInputTraits"/>
                         </searchBar>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TJK-XX-Gi6">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TJK-XX-Gi6">
                             <rect key="frame" x="313" y="11" width="46" height="30"/>
                             <state key="normal" title="Button"/>
                         </button>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="Kvs-8c-5zh" firstAttribute="top" secondItem="ouN-Ng-mBY" secondAttribute="top" constant="4" id="FO2-Oo-IkV"/>
                         <constraint firstItem="Kvs-8c-5zh" firstAttribute="leading" secondItem="ouN-Ng-mBY" secondAttribute="leading" constant="8" id="Lyr-hM-lTv"/>
@@ -94,4 +95,9 @@
             <point key="canvasLocation" x="-258.39999999999998" y="-215.8920539730135"/>
         </view>
     </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.swift b/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.swift
index 7a8b7e19f..5228fb978 100644
--- a/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.swift	
@@ -17,7 +17,7 @@ class TKUIAttributionCell: UITableViewCell {
 
   static let reuseIdentifier = "TKUIAttributionCell"
   
-  static let nib = UINib(nibName: "TKUIAttributionCell", bundle: Bundle(for: TKUIAttributionCell.self))
+  static let nib = UINib(nibName: "TKUIAttributionCell", bundle: .tripKitUI)
   
   var attribution: TKAPI.DataAttribution? {
     didSet { updateUI() }
diff --git a/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.xib b/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.xib
index 27f6b2aca..ea144c55e 100644
--- a/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUIAttributionCell.xib	
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIAttributionCell" rowHeight="348" id="w5G-cB-gZZ" customClass="TKUIAttributionCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUIAttributionCell" rowHeight="348" id="w5G-cB-gZZ" customClass="TKUIAttributionCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="348"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="w5G-cB-gZZ" id="mwz-ps-yRi">
@@ -17,17 +17,17 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="2mG-tH-hAk">
-                        <rect key="frame" x="15" y="11" width="345" height="326"/>
+                        <rect key="frame" x="16" y="11" width="343" height="326"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalHuggingPriority="252" verticalHuggingPriority="252" horizontalCompressionResistancePriority="753" verticalCompressionResistancePriority="753" scrollEnabled="NO" editable="NO" text="Title" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="NzM-oo-xY7">
-                                <rect key="frame" x="0.0" y="0.0" width="43.5" height="38"/>
+                                <rect key="frame" x="0.0" y="0.0" width="43" height="38"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                 <dataDetectorType key="dataDetectorTypes" link="YES"/>
                             </textView>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" verticalCompressionResistancePriority="752" scrollEnabled="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="eN5-ou-ACr">
-                                <rect key="frame" x="0.0" y="38" width="345" height="288"/>
+                                <rect key="frame" x="0.0" y="38" width="343" height="288"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
diff --git a/Sources/TripKitUI/views/trip overview/TKUINotificationView.swift b/Sources/TripKitUI/views/trip overview/TKUINotificationView.swift
index 52ed4b300..529cf2b85 100644
--- a/Sources/TripKitUI/views/trip overview/TKUINotificationView.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUINotificationView.swift	
@@ -43,9 +43,9 @@ class TKUINotificationView: UIView {
   @IBOutlet var detailImageViews: [UIImageView]!
   
   class func newInstance() -> TKUINotificationView {
-    return Bundle(for: self).loadNibNamed("TKUINotificationView",
-                                          owner: self,
-                                          options: nil)?.first as! TKUINotificationView
+    return Bundle.tripKitUI.loadNibNamed("TKUINotificationView",
+                                         owner: self,
+                                         options: nil)?.first as! TKUINotificationView
   }
 
   override func awakeFromNib() {
diff --git a/Sources/TripKitUI/views/trip overview/TKUINotificationView.xib b/Sources/TripKitUI/views/trip overview/TKUINotificationView.xib
index 96a3d98ab..fa75c5a46 100644
--- a/Sources/TripKitUI/views/trip overview/TKUINotificationView.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUINotificationView.xib	
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <accessibilityOverrides dynamicTypePreference="6"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -13,7 +13,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="E3S-qb-7f1" customClass="TKUINotificationView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="E3S-qb-7f1" customClass="TKUINotificationView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="336" height="289"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
diff --git a/Sources/TripKitUI/views/trip overview/TKUIPathFriendlinessView.xib b/Sources/TripKitUI/views/trip overview/TKUIPathFriendlinessView.xib
index 2e02824f7..934d99652 100644
--- a/Sources/TripKitUI/views/trip overview/TKUIPathFriendlinessView.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUIPathFriendlinessView.xib	
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIPathFriendlinessView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUIPathFriendlinessView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="375" height="65"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="6a0-Cz-EtD" userLabel="Legend">
-                    <rect key="frame" x="0.0" y="0.0" width="329.5" height="30.5"/>
+                    <rect key="frame" x="0.0" y="20" width="329.5" height="14.5"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="x9a-TJ-Yxi">
-                            <rect key="frame" x="0.0" y="8" width="69" height="14.5"/>
+                            <rect key="frame" x="0.0" y="0.0" width="69" height="14.5"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TV2-Od-H8b">
                                     <rect key="frame" x="0.0" y="1.5" width="12" height="12"/>
@@ -38,13 +36,13 @@
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#Friendly" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iXP-5z-5RP">
                                     <rect key="frame" x="16" y="0.0" width="53" height="14.5"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                    <color key="textColor" systemColor="darkTextColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                             </subviews>
                         </stackView>
                         <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="dbs-Yi-dic">
-                            <rect key="frame" x="77" y="8" width="82.5" height="14.5"/>
+                            <rect key="frame" x="77" y="0.0" width="82.5" height="14.5"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Ch-SE-UCV">
                                     <rect key="frame" x="0.0" y="1.5" width="12" height="12"/>
@@ -67,11 +65,11 @@
                             </subviews>
                         </stackView>
                         <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="VVs-pu-hF0">
-                            <rect key="frame" x="167.5" y="8" width="77.5" height="14.5"/>
+                            <rect key="frame" x="167.5" y="0.0" width="77.5" height="14.5"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ONZ-M1-JNZ">
                                     <rect key="frame" x="0.0" y="1.5" width="12" height="12"/>
-                                    <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
+                                    <color key="backgroundColor" systemColor="darkTextColor"/>
                                     <constraints>
                                         <constraint firstAttribute="width" secondItem="ONZ-M1-JNZ" secondAttribute="height" multiplier="1:1" id="3el-OU-rWH"/>
                                         <constraint firstAttribute="width" constant="12" id="Rjg-pw-kPq"/>
@@ -90,7 +88,7 @@
                             </subviews>
                         </stackView>
                         <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Dqu-Mc-ko9">
-                            <rect key="frame" x="253" y="8" width="76.5" height="14.5"/>
+                            <rect key="frame" x="253" y="0.0" width="76.5" height="14.5"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WFP-SO-5Kl">
                                     <rect key="frame" x="0.0" y="1.5" width="12" height="12"/>
@@ -115,7 +113,7 @@
                     </subviews>
                 </stackView>
                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U0R-7C-Vbc" userLabel="Bar Chart">
-                    <rect key="frame" x="0.0" y="38.5" width="375" height="8"/>
+                    <rect key="frame" x="0.0" y="42.5" width="375" height="8"/>
                     <subviews>
                         <view contentMode="scaleToFill" horizontalCompressionResistancePriority="751" placeholderIntrinsicWidth="250" placeholderIntrinsicHeight="8" translatesAutoresizingMaskIntoConstraints="NO" id="pE2-0a-GuL">
                             <rect key="frame" x="0.0" y="0.0" width="250" height="8"/>
@@ -130,7 +128,7 @@
                         </view>
                         <view contentMode="scaleToFill" horizontalCompressionResistancePriority="751" placeholderIntrinsicWidth="20" placeholderIntrinsicHeight="8" translatesAutoresizingMaskIntoConstraints="NO" id="fHS-tC-35v">
                             <rect key="frame" x="350" y="0.0" width="20" height="8"/>
-                            <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
+                            <color key="backgroundColor" systemColor="darkTextColor"/>
                         </view>
                         <view contentMode="scaleToFill" placeholderIntrinsicWidth="5" placeholderIntrinsicHeight="8" translatesAutoresizingMaskIntoConstraints="NO" id="oU9-U2-5m6">
                             <rect key="frame" x="370" y="0.0" width="5" height="8"/>
@@ -144,30 +142,31 @@
                     </constraints>
                 </stackView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#186m" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ovk-wO-7Wo" userLabel="#186m (Friendly)">
-                    <rect key="frame" x="0.0" y="50.5" width="39" height="14.5"/>
+                    <rect key="frame" x="0.0" y="54.5" width="39" height="10.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.0" green="0.60784313725490191" blue="0.87450980392156863" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#75m" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zTx-Fx-qGq" userLabel="#186m (Unfriendly)">
-                    <rect key="frame" x="250" y="50.5" width="32.5" height="14.5"/>
+                    <rect key="frame" x="250" y="52.5" width="32.5" height="14.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="1" green="0.71372549019607845" blue="0.094117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#39m" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LCm-DB-pzD" userLabel="#186m (Unknown)">
-                    <rect key="frame" x="341.5" y="50.5" width="33.5" height="14.5"/>
+                    <rect key="frame" x="341.5" y="52.5" width="33.5" height="14.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.60784313725490191" green="0.60784313725490191" blue="0.60784313725490191" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#75m" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dS2-hZ-VlU" userLabel="#186m (Dismount)">
-                    <rect key="frame" x="301" y="50.5" width="32.5" height="14.5"/>
+                    <rect key="frame" x="301" y="52.5" width="32.5" height="14.5"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" systemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="ovk-wO-7Wo" firstAttribute="leading" secondItem="pE2-0a-GuL" secondAttribute="leading" id="80v-n4-IXY"/>
@@ -189,7 +188,6 @@
                 <constraint firstItem="dS2-hZ-VlU" firstAttribute="leading" secondItem="fHS-tC-35v" secondAttribute="leading" priority="748" id="yYY-nn-yCs"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="dismountBarView" destination="fHS-tC-35v" id="cRG-wW-bp5"/>
                 <outlet property="dismountLegendDot" destination="ONZ-M1-JNZ" id="bbP-Vt-iXD"/>
@@ -214,4 +212,9 @@
             <point key="canvasLocation" x="-469.5" y="-370.5"/>
         </view>
     </objects>
+    <resources>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.swift b/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.swift
index 7df98de4d..13c5aeed3 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.swift	
@@ -21,7 +21,7 @@ class TKUISegmentAlertCell: UITableViewCell {
   @IBOutlet weak var chevronView: UIImageView!
   @IBOutlet weak var titlesStackView: UIStackView!
   
-  static let nib = UINib(nibName: "TKUISegmentAlertCell", bundle: Bundle(for: TKUISegmentAlertCell.self))
+  static let nib = UINib(nibName: "TKUISegmentAlertCell", bundle: .tripKitUI)
   
   static let reuseIdentifier = "TKUISegmentAlertCell"
 
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.xib b/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.xib
index 5e0f89835..8f0ae5faf 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentAlertCell.xib	
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUISegmentAlertCell" rowHeight="144" id="KGk-i7-Jjw" customClass="TKUISegmentAlertCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUISegmentAlertCell" rowHeight="144" id="KGk-i7-Jjw" customClass="TKUISegmentAlertCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="144"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -22,7 +23,7 @@
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-alert" translatesAutoresizingMaskIntoConstraints="NO" id="GQI-3C-bad">
                                 <rect key="frame" x="12" y="4" width="24" height="24"/>
-                                <color key="tintColor" systemColor="systemYellowColor" red="1" green="0.80000000000000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="tintColor" systemColor="systemYellowColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="24" id="JGL-s1-WbP"/>
                                     <constraint firstAttribute="width" constant="24" id="rLb-YO-2MR"/>
@@ -36,7 +37,7 @@
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chevron-right-small" translatesAutoresizingMaskIntoConstraints="NO" id="G3G-bG-srT">
                                 <rect key="frame" x="216" y="8" width="16" height="16"/>
-                                <color key="tintColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="tintColor" systemColor="darkTextColor"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="16" id="dw1-OQ-k4o"/>
                                     <constraint firstAttribute="width" secondItem="G3G-bG-srT" secondAttribute="height" multiplier="1:1" id="fax-ah-sit"/>
@@ -109,5 +110,11 @@
     <resources>
         <image name="chevron-right-small" width="16" height="16"/>
         <image name="icon-alert" width="24" height="24"/>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemYellowColor">
+            <color red="1" green="0.80000000000000004" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.swift b/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.swift
index 1ba5f9b2f..1c261a8f4 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.swift	
@@ -17,7 +17,7 @@ class TKUISegmentImpossibleCell: UITableViewCell {
   @IBOutlet weak var titleLabel: UILabel!
   @IBOutlet weak var button: UIButton!
   
-  static let nib = UINib(nibName: "TKUISegmentImpossibleCell", bundle: Bundle(for: TKUISegmentImpossibleCell.self))
+  static let nib = UINib(nibName: "TKUISegmentImpossibleCell", bundle: .tripKitUI)
   
   static let reuseIdentifier = "TKUISegmentImpossibleCell"
   
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.xib b/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.xib
index 8dd9e6683..6f3d03302 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentImpossibleCell.xib	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUISegmentImpossibleCell" rowHeight="95" id="KGk-i7-Jjw" customClass="TKUISegmentImpossibleCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TKUISegmentImpossibleCell" rowHeight="95" id="KGk-i7-Jjw" customClass="TKUISegmentImpossibleCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="95"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -23,7 +23,7 @@
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VDF-oE-Gim">
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VDF-oE-Gim">
                         <rect key="frame" x="105" y="40" width="110" height="39"/>
                         <inset key="contentEdgeInsets" minX="32" minY="8" maxX="32" maxY="8"/>
                         <state key="normal" title="Button"/>
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.swift b/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.swift
index 6f2a732be..3cd6c2c56 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.swift	
@@ -25,7 +25,7 @@ class TKUISegmentMovingCell: UITableViewCell {
   @IBOutlet weak var lineWrapper: UIView!
   @IBOutlet weak var line: UIView!
   
-  static let nib = UINib(nibName: "TKUISegmentMovingCell", bundle: Bundle(for: TKUISegmentMovingCell.self))
+  static let nib = UINib(nibName: "TKUISegmentMovingCell", bundle: .tripKitUI)
   
   static let reuseIdentifier = "TKUISegmentMovingCell"
   
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.xib b/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.xib
index 5c560f437..6c3ba41a6 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentMovingCell.xib	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentMovingCell" id="KGk-i7-Jjw" customClass="TKUISegmentMovingCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentMovingCell" id="KGk-i7-Jjw" customClass="TKUISegmentMovingCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="97"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -40,7 +40,7 @@
                         <rect key="frame" x="64" y="24.5" width="240" height="48.5"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="752" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cpZ-Mg-fai">
-                                <rect key="frame" x="0.0" y="0.0" width="42" height="20.5"/>
+                                <rect key="frame" x="0.0" y="0.0" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.swift b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.swift
index 35a1172e6..eed2ab3b8 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.swift	
@@ -38,7 +38,7 @@ class TKUISegmentStationaryCell: UITableViewCell {
   /// between 82 and 16 depending on whether there's a time stack.
   @IBOutlet weak var labelStackTrailingConstraint: NSLayoutConstraint!
   
-  static let nib = UINib(nibName: "TKUISegmentStationaryCell", bundle: Bundle(for: TKUISegmentStationaryCell.self))
+  static let nib = UINib(nibName: "TKUISegmentStationaryCell", bundle: .tripKitUI)
   
   static let reuseIdentifier = "TKUISegmentStationaryCell"
   
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.xib b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.xib
index 5bff4bb8f..e48b6c3ab 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryCell.xib	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentStationaryCell" id="KGk-i7-Jjw" customClass="TKUISegmentStationaryCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentStationaryCell" id="KGk-i7-Jjw" customClass="TKUISegmentStationaryCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="103"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.swift b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.swift
index 846560807..2649e8945 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.swift	
@@ -36,7 +36,7 @@ class TKUISegmentStationaryDoubleCell: UITableViewCell {
   /// between 82 and 16 depending on whether there's a time stack.
   @IBOutlet weak var labelStackTrailingConstraint: NSLayoutConstraint!
   
-  static let nib = UINib(nibName: "TKUISegmentStationaryDoubleCell", bundle: Bundle(for: TKUISegmentStationaryDoubleCell.self))
+  static let nib = UINib(nibName: "TKUISegmentStationaryDoubleCell", bundle: .tripKitUI)
   
   static let reuseIdentifier = "TKUISegmentStationaryDoubleCell"
   
diff --git a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.xib b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.xib
index 560fbe264..5f1abda77 100644
--- a/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUISegmentStationaryDoubleCell.xib	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentStationaryDoubleCell" id="KGk-i7-Jjw" customClass="TKUISegmentStationaryDoubleCell" customModule="TripKitUI" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TKUISegmentStationaryDoubleCell" id="KGk-i7-Jjw" customClass="TKUISegmentStationaryDoubleCell" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="320" height="103"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@@ -55,6 +55,7 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="18" id="BW7-eU-AUP"/>
+                                    <constraint firstAttribute="width" secondItem="a8c-tA-FUE" secondAttribute="height" multiplier="1:1" id="Fji-kr-lri"/>
                                     <constraint firstAttribute="width" secondItem="a8c-tA-FUE" secondAttribute="height" multiplier="1:1" id="HCT-9m-DJ7"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
@@ -76,7 +77,6 @@
                             <constraint firstItem="a8c-tA-FUE" firstAttribute="centerX" secondItem="QdG-jx-QtJ" secondAttribute="centerX" id="6g9-Km-JpZ"/>
                             <constraint firstItem="bmx-KO-aL2" firstAttribute="width" secondItem="fbJ-hg-ExU" secondAttribute="width" id="AIn-Le-Has"/>
                             <constraint firstItem="fbJ-hg-ExU" firstAttribute="bottom" secondItem="QdG-jx-QtJ" secondAttribute="centerY" id="DcI-Nx-9Mr"/>
-                            <constraint firstItem="a8c-tA-FUE" firstAttribute="width" secondItem="a8c-tA-FUE" secondAttribute="height" multiplier="1:1" id="Fji-kr-lri"/>
                             <constraint firstItem="bmx-KO-aL2" firstAttribute="top" secondItem="a8c-tA-FUE" secondAttribute="centerY" id="XY1-8e-cVb"/>
                             <constraint firstItem="fbJ-hg-ExU" firstAttribute="centerX" secondItem="zM4-hW-aEs" secondAttribute="centerX" id="ZQc-8c-8xM"/>
                             <constraint firstItem="fbJ-hg-ExU" firstAttribute="top" secondItem="zM4-hW-aEs" secondAttribute="top" id="bFB-hM-gzZ"/>
@@ -98,13 +98,13 @@
                                 <rect key="frame" x="0.0" y="24.5" width="240" height="18"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3rk-Bj-uEq">
-                                        <rect key="frame" x="0.0" y="0.0" width="120" height="18"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="198.5" height="18"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="752" text="hh:mm" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uce-ej-Z0P">
-                                        <rect key="frame" x="120" y="0.0" width="120" height="18"/>
+                                        <rect key="frame" x="198.5" y="0.0" width="41.5" height="18"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -115,13 +115,13 @@
                                 <rect key="frame" x="0.0" y="46.5" width="240" height="18"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kV6-XT-iWN">
-                                        <rect key="frame" x="0.0" y="0.0" width="120" height="18"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="198.5" height="18"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="752" text="hh:mm" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GZe-HK-fhy">
-                                        <rect key="frame" x="120" y="0.0" width="120" height="18"/>
+                                        <rect key="frame" x="198.5" y="0.0" width="41.5" height="18"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
diff --git a/Sources/TripKitUI/views/trip overview/TKUITripTitleView.swift b/Sources/TripKitUI/views/trip overview/TKUITripTitleView.swift
index 82149d301..43e64cd2e 100644
--- a/Sources/TripKitUI/views/trip overview/TKUITripTitleView.swift	
+++ b/Sources/TripKitUI/views/trip overview/TKUITripTitleView.swift	
@@ -22,7 +22,7 @@ class TKUITripTitleView: UIView {
   @IBOutlet weak var dismissButton: UIButton!
   
   static func newInstance() -> TKUITripTitleView {
-    return Bundle(for: TKUITripTitleView.self).loadNibNamed("TKUITripTitleView", owner: self, options: nil)?.first as! TKUITripTitleView
+    return Bundle.tripKitUI.loadNibNamed("TKUITripTitleView", owner: self, options: nil)?.first as! TKUITripTitleView
   }
 
   override func awakeFromNib() {
diff --git a/Sources/TripKitUI/views/trip overview/TKUITripTitleView.xib b/Sources/TripKitUI/views/trip overview/TKUITripTitleView.xib
index 3cd3a7d9f..2b13ee2f4 100644
--- a/Sources/TripKitUI/views/trip overview/TKUITripTitleView.xib	
+++ b/Sources/TripKitUI/views/trip overview/TKUITripTitleView.xib	
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="PuZ-UO-Kto" customClass="TKUITripTitleView" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="PuZ-UO-Kto" customClass="TKUITripTitleView" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="372" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
@@ -20,25 +20,25 @@
                         <stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" alignment="center" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="k6z-To-XRp">
                             <rect key="frame" x="0.0" y="0.0" width="302" height="16"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="04:59 - 05:35" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HpT-7Q-6Qy" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
-                                    <rect key="frame" x="0.0" y="0.0" width="91.5" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="04:59 - 05:35" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HpT-7Q-6Qy" customClass="TKUIStyledLabel" customModule="TripKitUI">
+                                    <rect key="frame" x="0.0" y="0.0" width="108" height="16"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Mx-Jy-AMQ" userLabel="Spacer">
-                                    <rect key="frame" x="95.5" y="0.0" width="154.5" height="16"/>
+                                    <rect key="frame" x="112" y="0.0" width="129" height="16"/>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 </view>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="36mins" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fBP-RS-YPy" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
-                                    <rect key="frame" x="254" y="0.0" width="48" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="36mins" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fBP-RS-YPy" customClass="TKUIStyledLabel" customModule="TripKitUI">
+                                    <rect key="frame" x="245" y="0.0" width="57" height="16"/>
                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                             </subviews>
                         </stackView>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ucH-Dq-vKm" customClass="TKUITripSegmentsView" customModule="TripKitUI" customModuleProvider="target">
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ucH-Dq-vKm" customClass="TKUITripSegmentsView" customModule="TripKitUI">
                             <rect key="frame" x="0.0" y="24" width="240" height="40"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>

From cd8bb998462518acac2f1dc641fe547a8d55fb4f Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Mon, 2 Sep 2024 13:19:51 +1000
Subject: [PATCH 4/9] Require iOS 15 for SPM usage

---
 Package.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index 13d7a1c9b..930aa5587 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -7,7 +7,7 @@ let package = Package(
   name: "TripKit",
   defaultLocalization: "en",
   platforms: [
-    .iOS(.v13),
+    .iOS(.v15),
     .macOS(.v11),
   ],
   products: [

From bbfe1d5f6eb253faccfe186c0b0815e9ba159d22 Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Mon, 2 Sep 2024 13:21:47 +1000
Subject: [PATCH 5/9] Add dynamic variants

---
 Package.swift | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/Package.swift b/Package.swift
index 930aa5587..ef4280183 100644
--- a/Package.swift
+++ b/Package.swift
@@ -11,16 +11,12 @@ let package = Package(
     .macOS(.v11),
   ],
   products: [
-    .library(
-      name: "TripKit",
-      targets: ["TripKit"]
-    ),
-    .library(
-      name: "TripKitUI",
-      targets: ["TripKitUI"]),
-    .library(
-      name: "TripKitInterApp",
-      targets: ["TripKitInterApp"]),
+    .library(name: "TripKit", targets: ["TripKit"]),
+    .library(name: "TripKitUI", targets: ["TripKitUI"]),
+    .library(name: "TripKitInterApp", targets: ["TripKitInterApp"]),
+    .library(name: "TripKit-Dynamic", type: .dynamic, targets: ["TripKit"]),
+    .library(name: "TripKitUI-Dynamic", type: .dynamic, targets: ["TripKitUI"]),
+    .library(name: "TripKitInterApp-Dynamic", type: .dynamic, targets: ["TripKitInterApp"]),
   ],
   dependencies: [
     .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.1.0")),

From 48b4e444cd6bab3a6eeadeca03adf956faed32b3 Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Mon, 2 Sep 2024 13:24:50 +1000
Subject: [PATCH 6/9] Remove remaining customModuleProvider="target" from
 TripKitUI

---
 .../controller/TKUIAttributionTableViewController.xib         | 2 +-
 .../TripKitUI/controller/TKUISectionedAlertViewController.xib | 2 +-
 Sources/TripKitUI/views/TKUITripModeByModeHeader.xib          | 4 ++--
 Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib   | 2 +-
 Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Sources/TripKitUI/controller/TKUIAttributionTableViewController.xib b/Sources/TripKitUI/controller/TKUIAttributionTableViewController.xib
index 6a3b17605..b22b96ad7 100644
--- a/Sources/TripKitUI/controller/TKUIAttributionTableViewController.xib
+++ b/Sources/TripKitUI/controller/TKUIAttributionTableViewController.xib
@@ -9,7 +9,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TKUIAttributionTableViewController" customModule="TripGoAppKit" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TKUIAttributionTableViewController" customModule="TripGoAppKit">
             <connections>
                 <outlet property="view" destination="i5M-Pr-FkT" id="NJI-Xf-1l5"/>
             </connections>
diff --git a/Sources/TripKitUI/controller/TKUISectionedAlertViewController.xib b/Sources/TripKitUI/controller/TKUISectionedAlertViewController.xib
index c26ce8ebf..6cbcdf15f 100644
--- a/Sources/TripKitUI/controller/TKUISectionedAlertViewController.xib
+++ b/Sources/TripKitUI/controller/TKUISectionedAlertViewController.xib
@@ -10,7 +10,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TKUISectionedAlertViewController" customModule="TripKitUI" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TKUISectionedAlertViewController" customModule="TripKitUI">
             <connections>
                 <outlet property="searchBar" destination="QcU-yO-3Wu" id="wCd-hn-t5M"/>
                 <outlet property="tableView" destination="M79-lI-HaZ" id="00q-mE-2fP"/>
diff --git a/Sources/TripKitUI/views/TKUITripModeByModeHeader.xib b/Sources/TripKitUI/views/TKUITripModeByModeHeader.xib
index 700e13c8c..e6e14d77c 100644
--- a/Sources/TripKitUI/views/TKUITripModeByModeHeader.xib
+++ b/Sources/TripKitUI/views/TKUITripModeByModeHeader.xib
@@ -10,7 +10,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUITripModeByModeHeader" customModule="TripKitUI" customModuleProvider="target">
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TKUITripModeByModeHeader" customModule="TripKitUI">
             <rect key="frame" x="0.0" y="0.0" width="393" height="155"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
@@ -26,7 +26,7 @@
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <view contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="Gkn-IV-uTT" customClass="TKUITripSegmentsView" customModule="TripKitUI" customModuleProvider="target">
+                <view contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="Gkn-IV-uTT" customClass="TKUITripSegmentsView" customModule="TripKitUI">
                     <rect key="frame" x="0.0" y="75" width="328" height="38"/>
                     <constraints>
                         <constraint firstAttribute="height" priority="999" constant="40" id="ONx-Uq-7BP"/>
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib
index 9da597fba..3cd20fc92 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceHeaderView.xib
@@ -103,7 +103,7 @@
                                 <stackView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="Suk-0j-f3c">
                                     <rect key="frame" x="28" y="26" width="354" height="122"/>
                                     <subviews>
-                                        <view contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vB3-gf-L3C" customClass="TKUITrainOccupancyView" customModule="TripKitUI" customModuleProvider="target">
+                                        <view contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vB3-gf-L3C" customClass="TKUITrainOccupancyView" customModule="TripKitUI">
                                             <rect key="frame" x="0.0" y="0.0" width="354" height="10"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="10" id="IBF-ox-DIl"/>
diff --git a/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib b/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib
index 8ee8bb0ff..c7abe314a 100644
--- a/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib
+++ b/Sources/TripKitUI/views/timetable/TKUIServiceTitleView.xib
@@ -36,7 +36,7 @@
                                 <view contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zTd-aC-Zmm">
                                     <rect key="frame" x="28" y="4" width="32.5" height="16"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="750" text="E84" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hOr-po-JDX" customClass="TKUIStyledLabel" customModule="TripKitUI" customModuleProvider="target">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="750" text="E84" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hOr-po-JDX" customClass="TKUIStyledLabel" customModule="TripKitUI">
                                             <rect key="frame" x="4" y="0.0" width="24.5" height="16"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                             <color key="textColor" systemColor="lightTextColor"/>

From 2b96034d58da0bfabf1a2dd691ec7d2907e062df Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Mon, 2 Sep 2024 14:07:30 +1000
Subject: [PATCH 7/9] Post-merge fix

---
 Sources/TripKitUI/views/TKUITripModeByModeHeader.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/TripKitUI/views/TKUITripModeByModeHeader.swift b/Sources/TripKitUI/views/TKUITripModeByModeHeader.swift
index 257da0e6b..c6ac5b4d1 100644
--- a/Sources/TripKitUI/views/TKUITripModeByModeHeader.swift
+++ b/Sources/TripKitUI/views/TKUITripModeByModeHeader.swift
@@ -26,7 +26,7 @@ class TKUITripModeByModeHeader: UIView {
   var actionHandler: () -> Void = {}
   
   static func newInstance() -> TKUITripModeByModeHeader {
-    let view = Bundle(for: self).loadNibNamed("TKUITripModeByModeHeader", owner: self, options: nil)?.first as! TKUITripModeByModeHeader
+    let view = Bundle.tripKitUI.loadNibNamed("TKUITripModeByModeHeader", owner: self, options: nil)?.first as! TKUITripModeByModeHeader
     return view
   }
   

From e5959d8d99e8422fd18e0e864181df1f109b8a7c Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Mon, 2 Sep 2024 14:36:28 +1000
Subject: [PATCH 8/9] Address a warning

---
 Package.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Package.swift b/Package.swift
index ef4280183..2c48793fc 100644
--- a/Package.swift
+++ b/Package.swift
@@ -56,7 +56,6 @@ let package = Package(
       ],
       exclude: [
         "Data",
-        "polygon/data",
         "Supporting Files/Info.plist",
       ]
     ),

From 07f9ca961afb20576f611933d700893684fbb76b Mon Sep 17 00:00:00 2001
From: Adrian Schoenig <adrian@schoenig.me>
Date: Mon, 2 Sep 2024 16:14:37 +1000
Subject: [PATCH 9/9] 13 => 14

---
 .github/workflows/swift.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index b9be61c52..5c60651ab 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build_spm:
-    runs-on: macos-13
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
@@ -18,19 +18,19 @@ jobs:
       - name: Build
         run: swift build --target TripKit
 
-  build_spm_monterey:
-    runs-on: macos-12
+  build_spm_macos13:
+    runs-on: macos-13
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 14.2
+          xcode-version: 15
       - uses: actions/checkout@v4
       - name: Build
         run: swift build --target TripKit
       
   build_xcode:
-    runs-on: macos-13
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
@@ -45,7 +45,7 @@ jobs:
         run: xcodebuild build -quiet -project TripKit.xcodeproj -scheme "TripKitInterApp-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
 
   test_xcode:
-    runs-on: macos-13
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
@@ -69,7 +69,7 @@ jobs:
         # even if the test fails in the previous step.
 
   examples:
-    runs-on: macos-13
+    runs-on: macos-14
 
     steps:
       - uses: maxim-lobanov/setup-xcode@v1