From 2477b633a4213c9a634b2d665232671190907795 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Thu, 5 Sep 2019 19:31:39 +0100
Subject: [PATCH 01/47] Fix revisions colors

---
 .../Models/DiffAbstractValue+Attributes.swift | 12 +++++----
 .../Pages/PageListSectionHeaderView.swift     |  3 +++
 .../Diffs/RevisionDiffViewController.swift    | 16 +++++++++---
 .../RevisionPreviewViewController.swift       |  1 +
 .../RevisionDiffsBrowserViewController.swift  |  4 +++
 .../Revisions/Browser/Revisions.storyboard    | 25 ++++++++++---------
 .../RevisionsTableViewController.swift        |  1 +
 .../Views/Cell/RevisionsTableViewCell.swift   |  3 +++
 .../Footer/RevisionsTableViewFooter.swift     |  2 +-
 .../RevisionOperationViewController.swift     |  2 ++
 10 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/WordPress/Classes/Models/DiffAbstractValue+Attributes.swift b/WordPress/Classes/Models/DiffAbstractValue+Attributes.swift
index 64b2e268298d..bd53953e8145 100644
--- a/WordPress/Classes/Models/DiffAbstractValue+Attributes.swift
+++ b/WordPress/Classes/Models/DiffAbstractValue+Attributes.swift
@@ -2,15 +2,17 @@ extension DiffAbstractValue {
     var attributes: [NSAttributedString.Key: Any]? {
         switch operation {
         case .add:
-            return [.backgroundColor: UIColor.muriel(color: MurielColor(name: .blue, shade: .shade5)),
+            return [.backgroundColor: UIColor(light: .muriel(color: MurielColor(name: .blue, shade: .shade5)),
+                                              dark: .primary(.shade80)),
                     .underlineStyle: NSNumber(value: 2),
-                    .underlineColor: UIColor.primary]
+                    .underlineColor: UIColor(light: .primary, dark: .primary(.shade20))]
         case .del:
-            return [.backgroundColor: UIColor.muriel(color: MurielColor(name: .red, shade: .shade5)),
+            return [.backgroundColor: UIColor(light: .muriel(color: MurielColor(name: .red, shade: .shade5)),
+                                              dark: .muriel(color: MurielColor(name: .red, shade: .shade80))),
                     .underlineStyle: NSNumber(value: 2),
-                    .underlineColor: UIColor.error,
+                    .underlineColor: UIColor(light: .error, dark: .muriel(color: MurielColor(name: .red, shade: .shade20))),
                     .strikethroughStyle: NSNumber(value: 1),
-                    .strikethroughColor: UIColor.black]
+                    .strikethroughColor: UIColor.text]
         default:
             return nil
         }
diff --git a/WordPress/Classes/ViewRelated/Pages/PageListSectionHeaderView.swift b/WordPress/Classes/ViewRelated/Pages/PageListSectionHeaderView.swift
index 218ca6ef4819..688e5a2d43ea 100644
--- a/WordPress/Classes/ViewRelated/Pages/PageListSectionHeaderView.swift
+++ b/WordPress/Classes/ViewRelated/Pages/PageListSectionHeaderView.swift
@@ -11,6 +11,9 @@ class PageListSectionHeaderView: UIView {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+
+        backgroundColor = .listBackground
+        titleLabel.backgroundColor = .listBackground
         WPStyleGuide.applyBorderStyle(separator)
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Diffs/RevisionDiffViewController.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Diffs/RevisionDiffViewController.swift
index f4b039a52c04..e9fb2f77d7fb 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Diffs/RevisionDiffViewController.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Diffs/RevisionDiffViewController.swift
@@ -5,15 +5,14 @@ class RevisionDiffViewController: UIViewController, StoryboardLoadable {
 
     @IBOutlet private var titleLabel: UILabel!
     @IBOutlet private var contentLabel: UILabel!
+    @IBOutlet private var scrollView: UIScrollView!
 
     var revision: Revision?
 
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        titleLabel.font = WPFontManager.notoBoldFont(ofSize: 24.0)
-        contentLabel.font = WPFontManager.notoRegularFont(ofSize: 16)
+        setupUI()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -22,8 +21,17 @@ class RevisionDiffViewController: UIViewController, StoryboardLoadable {
     }
 }
 
-
 private extension RevisionDiffViewController {
+    private func setupUI() {
+        view.backgroundColor = .basicBackground
+        scrollView.backgroundColor = .basicBackground
+
+        titleLabel.font = WPFontManager.notoBoldFont(ofSize: 24.0)
+        contentLabel.font = WPFontManager.notoRegularFont(ofSize: 16)
+        titleLabel.textColor = .text
+        contentLabel.textColor = .text
+    }
+
     private func showRevision() {
         guard let revision = revision else {
             return
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewViewController.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewViewController.swift
index 6d97f0bb4b84..8b5dc4c438e8 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewViewController.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Preview/RevisionPreviewViewController.swift
@@ -96,6 +96,7 @@ private extension RevisionPreviewViewController {
 //
 private extension RevisionPreviewViewController {
     private func addSubviews() {
+        view.backgroundColor = .basicBackground
         view.addSubview(textView)
         textView.addSubview(titleLabel)
     }
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/RevisionDiffsBrowserViewController.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/RevisionDiffsBrowserViewController.swift
index e85f203a2ce6..1ab542f6cb3a 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/RevisionDiffsBrowserViewController.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/RevisionDiffsBrowserViewController.swift
@@ -12,6 +12,8 @@ class RevisionDiffsBrowserViewController: UIViewController {
     private var contentPreviewState: ContentPreviewState = .html
 
     @IBOutlet private var containerView: UIView!
+    @IBOutlet private var strokeView: UIView!
+    @IBOutlet private var revisionContainer: UIView!
     @IBOutlet private var revisionTitle: UILabel!
     @IBOutlet private var previousButton: UIButton!
     @IBOutlet private var nextButton: UIButton!
@@ -143,6 +145,8 @@ private extension RevisionDiffsBrowserViewController {
         navigationItem.leftBarButtonItems = [doneBarButtonItem]
         navigationItem.rightBarButtonItems = [moreBarButtonItem, loadBarButtonItem]
         navigationItem.title = NSLocalizedString("Revision", comment: "Title of the screen that shows the revisions.")
+        strokeView.backgroundColor = .divider
+        revisionContainer.backgroundColor = .listForeground
     }
 
     private func updateNextPreviousButtons() {
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Revisions.storyboard b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Revisions.storyboard
index 2aaccc6e88cb..b9bf3148048a 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Revisions.storyboard
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Browser/Revisions.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9BX-ta-eQr">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9BX-ta-eQr">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -16,7 +14,7 @@
             <objects>
                 <navigationController id="9BX-ta-eQr" customClass="RevisionsNavigationController" customModule="WordPress" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" id="XL2-Md-hno">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -32,11 +30,11 @@
             <objects>
                 <viewController id="aEY-1G-H9o" customClass="RevisionDiffsBrowserViewController" customModule="WordPress" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" id="cG0-G3-XU5">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rsS-xc-ge8">
-                                <rect key="frame" x="0.0" y="539" width="375" height="64"/>
+                                <rect key="frame" x="0.0" y="559" width="375" height="64"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rSD-aC-9V4">
                                         <rect key="frame" x="0.0" y="7" width="50" height="50"/>
@@ -81,7 +79,7 @@
                                                 </connections>
                                             </containerView>
                                         </subviews>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstItem="T2k-GK-3TX" firstAttribute="top" secondItem="1Hg-z8-YVh" secondAttribute="bottom" constant="4" id="C5J-9t-sd9"/>
                                             <constraint firstItem="1Hg-z8-YVh" firstAttribute="top" secondItem="0zh-of-VUW" secondAttribute="top" id="Isk-s9-MoC"/>
@@ -109,7 +107,7 @@
                                 </constraints>
                             </view>
                             <containerView opaque="NO" contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uhq-mq-TeO">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="539"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <connections>
                                     <segue destination="1re-Hq-Vps" kind="embed" id="UdL-Ti-ban"/>
@@ -133,7 +131,9 @@
                         <outlet property="containerView" destination="uhq-mq-TeO" id="Ehy-69-qmb"/>
                         <outlet property="nextButton" destination="Und-hy-I90" id="Q6I-kh-y5d"/>
                         <outlet property="previousButton" destination="rSD-aC-9V4" id="s8K-96-nXk"/>
+                        <outlet property="revisionContainer" destination="rsS-xc-ge8" id="HyU-B2-o8q"/>
                         <outlet property="revisionTitle" destination="1Hg-z8-YVh" id="cXY-5C-yT6"/>
+                        <outlet property="strokeView" destination="7EM-Lu-3t1" id="d3c-cB-4j5"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="tS6-Ip-YDF" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -201,6 +201,7 @@ Nulla sodales mauris ullamcorper massa tincidunt, eu pretium erat fringilla. Sed
                     </view>
                     <connections>
                         <outlet property="contentLabel" destination="GYn-QL-8hI" id="1e4-Xp-22g"/>
+                        <outlet property="scrollView" destination="mb8-Xb-lI6" id="yWZ-vF-8Fg"/>
                         <outlet property="titleLabel" destination="GAe-1S-aM6" id="5uM-RT-M7h"/>
                     </connections>
                 </viewController>
@@ -215,7 +216,7 @@ Nulla sodales mauris ullamcorper massa tincidunt, eu pretium erat fringilla. Sed
                     <view key="view" contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" id="GfE-RI-5IB">
                         <rect key="frame" x="0.0" y="0.0" width="160" height="18"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="Ha8-OF-10N"/>
                     </view>
                 </viewController>
@@ -249,7 +250,7 @@ Nulla sodales mauris ullamcorper massa tincidunt, eu pretium erat fringilla. Sed
     </scenes>
     <resources>
         <namedColor name="Gray40">
-            <color red="0.50196078431372548" green="0.50196078431372548" blue="0.5490196078431373" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.49803921568627452" green="0.50196078431372548" blue="0.54117647058823526" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/RevisionsTableViewController.swift b/WordPress/Classes/ViewRelated/Post/Revisions/RevisionsTableViewController.swift
index 749d3b0a3068..912fcb6adec6 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/RevisionsTableViewController.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/RevisionsTableViewController.swift
@@ -79,6 +79,7 @@ private extension RevisionsTableViewController {
 
         tableView.tableFooterView = tableViewFooter
 
+        tableView.separatorColor = .divider
         WPStyleGuide.configureColors(view: view, tableView: tableView)
     }
 
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift
index d74dda0e6bc0..029c177a021e 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift
@@ -76,9 +76,12 @@ private extension RevisionsTableViewCell {
     private func setupStyles() {
         // Setup cell style
         WPStyleGuide.configureTableViewCell(self)
+        contentView.backgroundColor = .listForeground
 
         // Setup labels
+        titleLabel.backgroundColor = .listForeground
         titleLabel.textColor = .neutral(.shade70)
+        subTitleLabel.backgroundColor = .listForeground
         subTitleLabel.textColor = .neutral(.shade40)
 
         // Setup del operations
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Footer/RevisionsTableViewFooter.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Footer/RevisionsTableViewFooter.swift
index 88ae7a364547..cdf7e2ee4d89 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Footer/RevisionsTableViewFooter.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Footer/RevisionsTableViewFooter.swift
@@ -29,7 +29,7 @@ class RevisionsTableViewFooter: UIView {
 
 private extension RevisionsTableViewFooter {
     private func setupUI() {
-        backgroundColor = .neutral(.shade5)
+        backgroundColor = .listBackground
 
         autoresizingMask = .flexibleWidth
 
diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Operation/RevisionOperationViewController.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Operation/RevisionOperationViewController.swift
index ceaca5658c8e..4f5f4a417e88 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Operation/RevisionOperationViewController.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Operation/RevisionOperationViewController.swift
@@ -15,6 +15,8 @@ class RevisionOperationViewController: UIViewController {
     }
 
     private func setupViews() {
+        view.backgroundColor = .listForeground
+
         addView = RevisionOperation(.add).internalView
         delView = RevisionOperation(.del).internalView
 

From 45878c21a32de6eef9aa98ca2f23206e52e3f05c Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Mon, 2 Sep 2019 15:55:59 -0500
Subject: [PATCH 02/47] Accounts: Attempt to merge any duplicate accounts at
 launch.

---
 .../AccountService+MergeDuplicates.swift      | 55 +++++++++++++++++++
 WordPress/Classes/Services/AccountService.h   |  7 +++
 WordPress/Classes/Services/AccountService.m   |  5 --
 .../Classes/System/WordPressAppDelegate.swift |  1 +
 WordPress/WordPress.xcodeproj/project.pbxproj |  4 ++
 5 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 WordPress/Classes/Services/AccountService+MergeDuplicates.swift

diff --git a/WordPress/Classes/Services/AccountService+MergeDuplicates.swift b/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
new file mode 100644
index 000000000000..971e6ae7c356
--- /dev/null
+++ b/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
@@ -0,0 +1,55 @@
+import Foundation
+
+extension AccountService {
+
+    func mergeDuplicatesIfNecessary() {
+        let accounts = allAccounts()
+        guard accounts.count > 1 else {
+            return
+        }
+
+        let accountGroups = Dictionary(grouping: accounts) { $0.userID }
+        for key in accountGroups.keys {
+            guard let group = accountGroups[key], group.count > 1 else {
+                continue
+            }
+            mergeDuplicateAccounts(accounts: group)
+        }
+
+        if managedObjectContext.hasChanges {
+            ContextManager.sharedInstance().save(managedObjectContext)
+        }
+    }
+
+    private func mergeDuplicateAccounts(accounts: [WPAccount]) {
+        // For paranoia
+        guard accounts.count > 1 else {
+            return
+        }
+
+        // If one of the accounts is the default account, merge the rest into it.
+        // Otherwise just use the first account.
+        var destination = accounts.first!
+        if let defaultAccount = defaultWordPressComAccount(), accounts.contains(defaultAccount) {
+            destination = defaultAccount
+        }
+
+        for account in accounts {
+            if account == destination {
+                continue
+            }
+            mergeAccount(account: account, into: destination)
+        }
+
+        let service = BlogService(managedObjectContext: managedObjectContext)
+        service.deduplicateBlogs(for: destination)
+    }
+
+    private func mergeAccount(account: WPAccount, into destination: WPAccount) {
+        // Move all blogs to the destination account
+        destination.addBlogs(account.blogs)
+        account.removeBlogs(account.blogs)
+        managedObjectContext.delete(account)
+    }
+
+}
diff --git a/WordPress/Classes/Services/AccountService.h b/WordPress/Classes/Services/AccountService.h
index 778071a7c5e5..113a296e3d1b 100644
--- a/WordPress/Classes/Services/AccountService.h
+++ b/WordPress/Classes/Services/AccountService.h
@@ -111,6 +111,13 @@ extern NSNotificationName const WPAccountEmailAndDefaultBlogUpdatedNotification;
 
 - (NSUInteger)numberOfAccounts;
 
+/**
+ Returns all accounts currently existing in core data.
+
+ @return An array of WPAccounts.
+ */
+- (NSArray<WPAccount *> *)allAccounts;
+
 /**
  Returns a WordPress.com account with the specified username, if it exists
 
diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m
index de172e9385e2..c609ef281a7c 100644
--- a/WordPress/Classes/Services/AccountService.m
+++ b/WordPress/Classes/Services/AccountService.m
@@ -243,11 +243,6 @@ - (NSUInteger)numberOfAccounts
     return count;
 }
 
-/**
- Returns all accounts currently existing in core data.
-
- @return An array of WPAccounts.
- */
 - (NSArray<WPAccount *> *)allAccounts
 {
     NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"Account"];
diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift
index 168d28d8a1d9..1aecd05171e6 100644
--- a/WordPress/Classes/System/WordPressAppDelegate.swift
+++ b/WordPress/Classes/System/WordPressAppDelegate.swift
@@ -56,6 +56,7 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
 
+        AccountService.init(managedObjectContext: ContextManager.shared.mainContext).mergeDuplicatesIfNecessary()
         // Configure WPCom API overrides
         configureWordPressComApi()
 
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index a4440c9a9fab..95f576f08474 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -1841,6 +1841,7 @@
 		E6B9B8AF1B94FA1C0001B92F /* ReaderStreamViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6B9B8AE1B94FA1C0001B92F /* ReaderStreamViewControllerTests.swift */; };
 		E6BDEA731CE4824300682885 /* ReaderSearchTopic.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6BDEA721CE4824300682885 /* ReaderSearchTopic.swift */; };
 		E6C09B3E1BF0FDEB003074CB /* ReaderCrossPostMeta.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6C09B3D1BF0FDEB003074CB /* ReaderCrossPostMeta.swift */; };
+		E6C0ED3B231DA23400A08B57 /* AccountService+MergeDuplicates.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6C0ED3A231DA23400A08B57 /* AccountService+MergeDuplicates.swift */; };
 		E6C892D61C601D55007AD612 /* SharingButtonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6C892D51C601D55007AD612 /* SharingButtonsViewController.swift */; };
 		E6D170371EF9D8D10046D433 /* SiteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6D170361EF9D8D10046D433 /* SiteInfo.swift */; };
 		E6D2E15F1B8A9C830000ED14 /* ReaderSiteStreamHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = E6D2E15E1B8A9C830000ED14 /* ReaderSiteStreamHeader.xib */; };
@@ -4182,6 +4183,7 @@
 		E6B9B8AE1B94FA1C0001B92F /* ReaderStreamViewControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderStreamViewControllerTests.swift; sourceTree = "<group>"; };
 		E6BDEA721CE4824300682885 /* ReaderSearchTopic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReaderSearchTopic.swift; sourceTree = "<group>"; };
 		E6C09B3D1BF0FDEB003074CB /* ReaderCrossPostMeta.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReaderCrossPostMeta.swift; path = Classes/Models/ReaderCrossPostMeta.swift; sourceTree = SOURCE_ROOT; };
+		E6C0ED3A231DA23400A08B57 /* AccountService+MergeDuplicates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AccountService+MergeDuplicates.swift"; sourceTree = "<group>"; };
 		E6C892D51C601D55007AD612 /* SharingButtonsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SharingButtonsViewController.swift; sourceTree = "<group>"; };
 		E6D170361EF9D8D10046D433 /* SiteInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteInfo.swift; sourceTree = "<group>"; };
 		E6D2E15E1B8A9C830000ED14 /* ReaderSiteStreamHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReaderSiteStreamHeader.xib; sourceTree = "<group>"; };
@@ -6872,6 +6874,7 @@
 				B5EFB1C31B31B99D007608A3 /* Facades */,
 				93C1147D18EC5DD500DAC95C /* AccountService.h */,
 				93C1147E18EC5DD500DAC95C /* AccountService.m */,
+				E6C0ED3A231DA23400A08B57 /* AccountService+MergeDuplicates.swift */,
 				E1FD45DF1C030B3800750F4C /* AccountSettingsService.swift */,
 				822D60B81F4CCC7A0016C46D /* BlogJetpackSettingsService.swift */,
 				93C1148318EDF6E100DAC95C /* BlogService.h */,
@@ -10878,6 +10881,7 @@
 				E6E27D621C6144DB0063F821 /* SharingButton.swift in Sources */,
 				570BFD8B22823D7B007859A8 /* PostActionSheet.swift in Sources */,
 				E6374DC01C444D8B00F24720 /* PublicizeConnection.swift in Sources */,
+				E6C0ED3B231DA23400A08B57 /* AccountService+MergeDuplicates.swift in Sources */,
 				0845B8C61E833C56001BA771 /* URL+Helpers.swift in Sources */,
 				17D975AF1EF7F6F100303D63 /* WPStyleGuide+Aztec.swift in Sources */,
 				5D17F0BE1A1D4C5F0087CCB8 /* PrivateSiteURLProtocol.m in Sources */,

From 90db03f0a2a95f5db14e8e787155208a2785e361 Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Mon, 2 Sep 2019 16:10:35 -0500
Subject: [PATCH 03/47] Tests: Adds tests for merging dup accounts.

---
 .../WordPressTest/AccountServiceTests.swift   | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/WordPress/WordPressTest/AccountServiceTests.swift b/WordPress/WordPressTest/AccountServiceTests.swift
index 9f9801a4bd0a..fd36b30d771e 100644
--- a/WordPress/WordPressTest/AccountServiceTests.swift
+++ b/WordPress/WordPressTest/AccountServiceTests.swift
@@ -139,4 +139,89 @@ class AccountServiceTests: XCTestCase {
         XCTAssertNil(accountService.defaultWordPressComAccount())
     }
 
+    func testMergeMultipleDuplicateAccounts() {
+        let account1 = WPAccount(context: contextManager.mainContext)
+        account1.userID = 1
+        account1.username = "username"
+        account1.authToken = "authToken"
+        account1.uuid = UUID().uuidString
+
+        let account2 = WPAccount(context: contextManager.mainContext)
+        account2.userID = 1
+        account2.username = "username"
+        account2.authToken = "authToken"
+        account2.uuid = UUID().uuidString
+
+        let account3 = WPAccount(context: contextManager.mainContext)
+        account3.userID = 1
+        account3.username = "username"
+        account3.authToken = "authToken"
+        account3.uuid = UUID().uuidString
+
+        let context = contextManager.mainContext
+        account1.addBlogs(createMockBlogs(withIDs: [1,2,3,4,5,6], in: context))
+        account2.addBlogs(createMockBlogs(withIDs: [1,2,3], in: context))
+        account3.addBlogs(createMockBlogs(withIDs: [4,5,6], in: context))
+        contextManager.save(context)
+
+        accountService.mergeDuplicatesIfNecessary()
+        contextManager.save(context)
+
+        XCTAssertFalse(account1.isDeleted)
+        XCTAssertTrue(account2.isDeleted)
+        XCTAssertTrue(account3.isDeleted)
+
+        let service = BlogService(managedObjectContext: contextManager.mainContext)
+        let blogs = service.blogsForAllAccounts()
+        XCTAssertTrue(blogs.count == 6)
+        XCTAssertTrue(account1.blogs.count == 6)
+    }
+
+    func testMergeDuplicateAccountsKeepingNonDups() {
+        let account1 = WPAccount(context: contextManager.mainContext)
+        account1.userID = 1
+        account1.username = "username"
+        account1.authToken = "authToken"
+        account1.uuid = UUID().uuidString
+
+        let account2 = WPAccount(context: contextManager.mainContext)
+        account2.userID = 1
+        account2.username = "username"
+        account2.authToken = "authToken"
+        account2.uuid = UUID().uuidString
+
+        let account3 = WPAccount(context: contextManager.mainContext)
+        account3.userID = 3
+        account3.username = "username3"
+        account3.authToken = "authToken3"
+        account3.uuid = UUID().uuidString
+
+        let context = contextManager.mainContext
+        account1.addBlogs(createMockBlogs(withIDs: [1,2,3,4,5,6], in: context))
+        account2.addBlogs(createMockBlogs(withIDs: [1,2,3], in: context))
+        account3.addBlogs(createMockBlogs(withIDs: [4,5,6], in: context))
+        contextManager.save(context)
+
+        accountService.mergeDuplicatesIfNecessary()
+        contextManager.save(context)
+
+        XCTAssertFalse(account1.isDeleted)
+        XCTAssertTrue(account2.isDeleted)
+        XCTAssertFalse(account3.isDeleted)
+    }
+
+    func createMockBlogs(withIDs IDs:[Int], in context: NSManagedObjectContext) -> Set<Blog> {
+        var blogs = Set<Blog>()
+        for id in IDs {
+            let blog = Blog(context: context)
+            blog.dotComID = NSNumber(integerLiteral: id)
+            blog.xmlrpc = "http://test.blog/\(id)/xmlrpc.php"
+            blog.username = "admin"
+            blog.url = "http://test.blog/\(id)"
+            blog.isHostedAtWPcom = true
+            blogs.insert(blog)
+        }
+        return blogs
+    }
+
 }

From 7f3eee651dc0c507a67a438dea1072149a1ecb15 Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Mon, 2 Sep 2019 20:22:29 -0500
Subject: [PATCH 04/47] Tests: Code style.

---
 WordPress/WordPressTest/AccountServiceTests.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/WordPressTest/AccountServiceTests.swift b/WordPress/WordPressTest/AccountServiceTests.swift
index fd36b30d771e..334de7842274 100644
--- a/WordPress/WordPressTest/AccountServiceTests.swift
+++ b/WordPress/WordPressTest/AccountServiceTests.swift
@@ -210,7 +210,7 @@ class AccountServiceTests: XCTestCase {
         XCTAssertFalse(account3.isDeleted)
     }
 
-    func createMockBlogs(withIDs IDs:[Int], in context: NSManagedObjectContext) -> Set<Blog> {
+    func createMockBlogs(withIDs IDs: [Int], in context: NSManagedObjectContext) -> Set<Blog> {
         var blogs = Set<Blog>()
         for id in IDs {
             let blog = Blog(context: context)

From 32de5d38f6f167525bfda875b980c03ababcc8e6 Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Mon, 2 Sep 2019 20:22:46 -0500
Subject: [PATCH 05/47] Accounts: Changes from code review.

---
 .../Services/AccountService+MergeDuplicates.swift     | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/WordPress/Classes/Services/AccountService+MergeDuplicates.swift b/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
index 971e6ae7c356..2704d30ce912 100644
--- a/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
+++ b/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
@@ -9,10 +9,7 @@ extension AccountService {
         }
 
         let accountGroups = Dictionary(grouping: accounts) { $0.userID }
-        for key in accountGroups.keys {
-            guard let group = accountGroups[key], group.count > 1 else {
-                continue
-            }
+        for group in accountGroups.values where group.count > 1 {
             mergeDuplicateAccounts(accounts: group)
         }
 
@@ -34,10 +31,7 @@ extension AccountService {
             destination = defaultAccount
         }
 
-        for account in accounts {
-            if account == destination {
-                continue
-            }
+        for account in accounts where account != destination {
             mergeAccount(account: account, into: destination)
         }
 
@@ -48,7 +42,6 @@ extension AccountService {
     private func mergeAccount(account: WPAccount, into destination: WPAccount) {
         // Move all blogs to the destination account
         destination.addBlogs(account.blogs)
-        account.removeBlogs(account.blogs)
         managedObjectContext.delete(account)
     }
 

From 87454776efe430bdc7f5b476cbde03f8e67d0517 Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Tue, 3 Sep 2019 11:13:07 -0500
Subject: [PATCH 06/47] Code Style: See if this will silence hound.

---
 WordPress/WordPressTest/AccountServiceTests.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/WordPressTest/AccountServiceTests.swift b/WordPress/WordPressTest/AccountServiceTests.swift
index 334de7842274..d8c70e93034b 100644
--- a/WordPress/WordPressTest/AccountServiceTests.swift
+++ b/WordPress/WordPressTest/AccountServiceTests.swift
@@ -159,9 +159,9 @@ class AccountServiceTests: XCTestCase {
         account3.uuid = UUID().uuidString
 
         let context = contextManager.mainContext
-        account1.addBlogs(createMockBlogs(withIDs: [1,2,3,4,5,6], in: context))
-        account2.addBlogs(createMockBlogs(withIDs: [1,2,3], in: context))
-        account3.addBlogs(createMockBlogs(withIDs: [4,5,6], in: context))
+        account1.addBlogs(createMockBlogs(withIDs: [1, 2, 3, 4, 5, 6], in: context))
+        account2.addBlogs(createMockBlogs(withIDs: [1, 2, 3], in: context))
+        account3.addBlogs(createMockBlogs(withIDs: [4, 5, 6], in: context))
         contextManager.save(context)
 
         accountService.mergeDuplicatesIfNecessary()

From ed932f00bd17cd4a4e9494e520dca500cd8ed5cd Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Tue, 3 Sep 2019 11:21:07 -0500
Subject: [PATCH 07/47] Code style: And fix the ones I overlooked.

---
 WordPress/WordPressTest/AccountServiceTests.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WordPress/WordPressTest/AccountServiceTests.swift b/WordPress/WordPressTest/AccountServiceTests.swift
index d8c70e93034b..a4f66ddf5a8e 100644
--- a/WordPress/WordPressTest/AccountServiceTests.swift
+++ b/WordPress/WordPressTest/AccountServiceTests.swift
@@ -197,9 +197,9 @@ class AccountServiceTests: XCTestCase {
         account3.uuid = UUID().uuidString
 
         let context = contextManager.mainContext
-        account1.addBlogs(createMockBlogs(withIDs: [1,2,3,4,5,6], in: context))
-        account2.addBlogs(createMockBlogs(withIDs: [1,2,3], in: context))
-        account3.addBlogs(createMockBlogs(withIDs: [4,5,6], in: context))
+        account1.addBlogs(createMockBlogs(withIDs: [1, 2, 3, 4, 5, 6], in: context))
+        account2.addBlogs(createMockBlogs(withIDs: [1, 2, 3], in: context))
+        account3.addBlogs(createMockBlogs(withIDs: [4, 5, 6], in: context))
         contextManager.save(context)
 
         accountService.mergeDuplicatesIfNecessary()

From 161f32288ab661d8512db35fcc071dcf3257cb60 Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Tue, 3 Sep 2019 11:41:50 -0500
Subject: [PATCH 08/47] Code style: Remove init

---
 WordPress/Classes/System/WordPressAppDelegate.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift
index 1aecd05171e6..b5e8fdc3f051 100644
--- a/WordPress/Classes/System/WordPressAppDelegate.swift
+++ b/WordPress/Classes/System/WordPressAppDelegate.swift
@@ -56,7 +56,7 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
 
-        AccountService.init(managedObjectContext: ContextManager.shared.mainContext).mergeDuplicatesIfNecessary()
+        AccountService(managedObjectContext: ContextManager.shared.mainContext).mergeDuplicatesIfNecessary()
         // Configure WPCom API overrides
         configureWordPressComApi()
 

From d16ceb051cd968f035f8f8b6ac742b8d44c4a5fd Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Tue, 3 Sep 2019 18:14:59 -0500
Subject: [PATCH 09/47] Merge duplicates from dispatch queue.

---
 WordPress/Classes/System/WordPressAppDelegate.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift
index b5e8fdc3f051..3aae43851ad7 100644
--- a/WordPress/Classes/System/WordPressAppDelegate.swift
+++ b/WordPress/Classes/System/WordPressAppDelegate.swift
@@ -56,7 +56,6 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
 
-        AccountService(managedObjectContext: ContextManager.shared.mainContext).mergeDuplicatesIfNecessary()
         // Configure WPCom API overrides
         configureWordPressComApi()
 
@@ -235,6 +234,7 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
         // Deferred tasks to speed up app launch
         DispatchQueue.global(qos: .background).async { [weak self] in
+            AccountService(managedObjectContext: ContextManager.shared.mainContext).mergeDuplicatesIfNecessary()
             MediaCoordinator.shared.refreshMediaStatus()
             PostCoordinator.shared.refreshPostStatus()
             MediaFileManager.clearUnusedMediaUploadFiles(onCompletion: nil, onError: nil)

From 21e2b2b0550191a5388bbcd98e77de069c3270e9 Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Wed, 4 Sep 2019 11:57:44 -0500
Subject: [PATCH 10/47] Account: Do work in perform block.

---
 WordPress/Classes/System/WordPressAppDelegate.swift | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift
index 3aae43851ad7..e070221805ed 100644
--- a/WordPress/Classes/System/WordPressAppDelegate.swift
+++ b/WordPress/Classes/System/WordPressAppDelegate.swift
@@ -234,7 +234,7 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
         // Deferred tasks to speed up app launch
         DispatchQueue.global(qos: .background).async { [weak self] in
-            AccountService(managedObjectContext: ContextManager.shared.mainContext).mergeDuplicatesIfNecessary()
+            self?.mergeDuplicateAccountsIfNeeded()
             MediaCoordinator.shared.refreshMediaStatus()
             PostCoordinator.shared.refreshPostStatus()
             MediaFileManager.clearUnusedMediaUploadFiles(onCompletion: nil, onError: nil)
@@ -250,6 +250,13 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         setupNoticePresenter()
     }
 
+    private func mergeDuplicateAccountsIfNeeded() {
+        let context = ContextManager.shared.mainContext
+        context.perform {
+            AccountService(managedObjectContext: ContextManager.shared.mainContext).mergeDuplicatesIfNecessary()
+        }
+    }
+
     private func setupPingHub() {
         pingHubManager = PingHubManager()
     }

From 55c5f1d825f8e97170324bf3d3df208140b74faf Mon Sep 17 00:00:00 2001
From: aerych <aerychj@gmail.com>
Date: Thu, 5 Sep 2019 11:00:57 -0500
Subject: [PATCH 11/47] Accounts: More efficiently count accounts when merging
 dups.

---
 .../Classes/Services/AccountService+MergeDuplicates.swift     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Classes/Services/AccountService+MergeDuplicates.swift b/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
index 2704d30ce912..36b6e538c3b2 100644
--- a/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
+++ b/WordPress/Classes/Services/AccountService+MergeDuplicates.swift
@@ -3,11 +3,11 @@ import Foundation
 extension AccountService {
 
     func mergeDuplicatesIfNecessary() {
-        let accounts = allAccounts()
-        guard accounts.count > 1 else {
+        guard numberOfAccounts() > 1 else {
             return
         }
 
+        let accounts = allAccounts()
         let accountGroups = Dictionary(grouping: accounts) { $0.userID }
         for group in accountGroups.values where group.count > 1 {
             mergeDuplicateAccounts(accounts: group)

From bd29ac834e1ace71c5838c02ee47bc71df49ec24 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 09:43:51 +0100
Subject: [PATCH 12/47] Fix Muriel placeholder color

---
 .../Colors and Styles/UIColor+MurielColors.swift         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift
index 1f0c3d99c596..8f989fcbd89a 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
@@ -158,7 +158,14 @@ extension UIColor {
     }
 
     static var textInverted = UIColor(light: .white, dark: .gray(.shade100))
-    static var textPlaceholder = neutral(.shade30)
+    static var textPlaceholder: UIColor {
+        #if XCODE11
+            if #available(iOS 13, *) {
+                return .tertiaryLabel
+            }
+        #endif
+        return neutral(.shade30)
+    }
     static var placeholderElement: UIColor {
         #if XCODE11
             if #available(iOS 13, *) {

From 3b0c902148891173a14caaf1961c71dda14eb5be Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 09:44:37 +0100
Subject: [PATCH 13/47] Fix Page List cell labels colors

---
 WordPress/Classes/ViewRelated/Pages/PageListTableViewCell.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Pages/PageListTableViewCell.m b/WordPress/Classes/ViewRelated/Pages/PageListTableViewCell.m
index 4b7c7fe0377f..db1afa3cf311 100644
--- a/WordPress/Classes/ViewRelated/Pages/PageListTableViewCell.m
+++ b/WordPress/Classes/ViewRelated/Pages/PageListTableViewCell.m
@@ -109,8 +109,8 @@ - (void)applyStyles
     self.titleLabel.font = [WPStyleGuide notoBoldFontForTextStyle:UIFontTextStyleHeadline];
     self.titleLabel.adjustsFontForContentSizeCategory = YES;
     
-    self.titleLabel.textColor = [UIColor murielNeutral70];
-    self.badgesLabel.textColor = [UIColor murielNeutral];
+    self.titleLabel.textColor = [UIColor murielText];
+    self.badgesLabel.textColor = [UIColor murielTextSubtle];
     self.menuButton.tintColor = [UIColor murielTextSubtle];
     [self.menuButton setImage:[Gridicon iconOfType:GridiconTypeEllipsis] forState:UIControlStateNormal];
 

From d139361237caa06e3701e97e6d1d216f58a7a50d Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 09:45:42 +0100
Subject: [PATCH 14/47] Fix date formatter

This is a fix due to a wrong merge. The right fix has been introduced with fix/stats-timezone-delta PR
---
 .../ViewRelated/Stats/SiteStatsDashboardViewController.swift    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
index 6357819c1329..7bf6fcc462ca 100644
--- a/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
+++ b/WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift
@@ -142,7 +142,7 @@ private extension SiteStatsDashboardViewController {
                                                        animated: false)
             }
 
-            periodTableViewController.selectedDate = periodDate ?? StatsDataHelper.currentDateForSite().normalizedForSite()
+            periodTableViewController.selectedDate = periodDate ?? StatsDataHelper.currentDateForSite()
             let selectedPeriod = StatsPeriodUnit(rawValue: currentSelectedPeriod.rawValue - 1) ?? .day
             periodTableViewController.selectedPeriod = selectedPeriod
         }

From 831664c1f0c8cafb4d890eb073c8158583824260 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 09:46:12 +0100
Subject: [PATCH 15/47] Start fixing first content on site creation

---
 .../Site Creation/SiteSegments/SiteSegmentsCell.swift  | 10 ++++------
 .../SiteSegments/SiteSegmentsWizardContent.swift       |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsCell.swift b/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsCell.swift
index 84a821b275f7..25feba0a378f 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsCell.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsCell.swift	
@@ -28,9 +28,7 @@ final class SiteSegmentsCell: UITableViewCell, ModelSettableCell {
             if let modelIcon = model?.icon {
                 icon.downloadImage(from: modelIcon, placeholderImage: nil, success: { [weak self] downloadedImage in
                     let tintedImage = downloadedImage.withRenderingMode(.alwaysTemplate)
-                    if let tintColor = self?.model?.iconTintColor {
-                        self?.icon.tintColor = tintColor
-                    }
+                    self?.icon.tintColor = .listIcon
                     self?.icon.image = tintedImage
                 }, failure: nil)
             }
@@ -61,18 +59,18 @@ final class SiteSegmentsCell: UITableViewCell, ModelSettableCell {
     }
 
     private func styleBackground() {
-        backgroundColor = .white
+        backgroundColor = .listForeground
     }
 
     private func styleTitle() {
         title.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .semibold)
-        title.textColor = .neutral(.shade70)
+        title.textColor = .text
         title.adjustsFontForContentSizeCategory = true
     }
 
     private func styleSubtitle() {
         subtitle.font = WPStyleGuide.fontForTextStyle(.callout, fontWeight: .regular)
-        subtitle.textColor = .neutral(.shade70)
+        subtitle.textColor = .textSubtle
         subtitle.adjustsFontForContentSizeCategory = true
     }
 
diff --git a/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift b/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift
index 300935d59564..b8b7c06a9e41 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift	
@@ -81,11 +81,11 @@ final class SiteSegmentsWizardContent: UIViewController {
     }
 
     private func setupTableBackground() {
-        table.backgroundColor = .neutral(.shade5)
+        table.backgroundColor = .listBackground
     }
 
     private func setupTableSeparator() {
-        table.separatorColor = .neutral(.shade10)
+        table.separatorColor = .divider
     }
 
     private func hideSeparators() {

From 43214c54a0365a7bab85f41e3a0074b2e5981104 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 10:17:16 +0100
Subject: [PATCH 16/47] Fix labels colors

---
 .../Post/Revisions/Views/Cell/RevisionsTableViewCell.swift    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift
index 029c177a021e..b7f1f0d28f10 100644
--- a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift
@@ -80,9 +80,9 @@ private extension RevisionsTableViewCell {
 
         // Setup labels
         titleLabel.backgroundColor = .listForeground
-        titleLabel.textColor = .neutral(.shade70)
+        titleLabel.textColor = .text
         subTitleLabel.backgroundColor = .listForeground
-        subTitleLabel.textColor = .neutral(.shade40)
+        subTitleLabel.textColor = .textSubtle
 
         // Setup del operations
         delOperation = RevisionOperation(.del)

From 0fd3e507b1559eb2f732b07f18da7789fd6e4169 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 12:49:21 +0100
Subject: [PATCH 17/47] Fix colors in site creation

---
 .../SiteAssemblyContentView.swift             |  4 ++-
 .../Shared/TitleSubtitleHeader.swift          |  2 +-
 .../Shared/TitleSubtitleTextfieldHeader.swift | 32 +++++++++++++------
 .../SiteInformationWizardContent.swift        | 18 +++++++----
 .../SiteSegmentsWizardContent.swift           |  2 +-
 .../Verticals/NewVerticalCell.swift           |  4 +--
 .../Verticals/VerticalsCell.swift             |  2 +-
 .../Verticals/VerticalsWizardContent.swift    | 10 +++---
 .../WebAddress/AddressCell.swift              |  6 ++--
 .../WebAddress/WebAddressWizardContent.swift  | 12 +++----
 10 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift b/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift
index 104f58875386..c1a3b305f52c 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift	
@@ -244,10 +244,12 @@ final class SiteAssemblyContentView: UIView {
             return
         }
 
+        buttonContainerView.backgroundColor = .basicBackground
+
         // This wrapper view provides underlap for Home indicator
         let buttonContainerContainer = UIView(frame: .zero)
         buttonContainerContainer.translatesAutoresizingMaskIntoConstraints = false
-        buttonContainerContainer.backgroundColor = .white
+        buttonContainerContainer.backgroundColor = .basicBackground
         buttonContainerContainer.addSubview(buttonContainerView)
         addSubview(buttonContainerContainer)
         self.buttonContainerContainer = buttonContainerContainer
diff --git a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift
index ff1d50bb3820..76ebe36d2198 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift	
@@ -71,7 +71,7 @@ final class TitleSubtitleHeader: UIView {
     }
 
     private func styleBackground() {
-        backgroundColor = .neutral(.shade5)
+        backgroundColor = .listBackground
     }
 
     private func styleTitle() {
diff --git a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift
index ae69db93d417..a62017b5fbc0 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift	
@@ -68,17 +68,28 @@ final class SearchTextField: UITextField {
     private func initialize() {
         translatesAutoresizingMaskIntoConstraints = false
 
-        backgroundColor = .white
+        backgroundColor = .listForeground
         clearButtonMode = .whileEditing
         font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
-        textColor = .neutral(.shade70)
+        textColor = .text
 
         autocapitalizationType = .none
         autocorrectionType = .no
         adjustsFontForContentSizeCategory = true
 
+        setIconImage()
+
+        NSLayoutConstraint.activate([
+            heightAnchor.constraint(equalToConstant: Constants.searchHeight),
+            ])
+
+        addTopBorder(withColor: .divider)
+        addBottomBorder(withColor: .divider)
+    }
+
+    private func setIconImage() {
         let iconSize = CGSize(width: Constants.iconDimension, height: Constants.iconDimension)
-        let loupeIcon = Gridicon.iconOfType(.search, withSize: iconSize).imageWithTintColor(WPStyleGuide.readerCardCellHighlightedBorderColor())?.imageFlippedForRightToLeftLayoutDirection()
+        let loupeIcon = Gridicon.iconOfType(.search, withSize: iconSize).imageWithTintColor(.listIcon)?.imageFlippedForRightToLeftLayoutDirection()
         let imageView = UIImageView(image: loupeIcon)
 
         if traitCollection.layoutDirection == .rightToLeft {
@@ -88,13 +99,16 @@ final class SearchTextField: UITextField {
             leftView = imageView
             leftViewMode = .always
         }
+    }
 
-        NSLayoutConstraint.activate([
-            heightAnchor.constraint(equalToConstant: Constants.searchHeight),
-            ])
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
 
-        addTopBorder(withColor: .neutral(.shade10))
-        addBottomBorder(withColor: .neutral(.shade10))
+        #if XCODE11
+            if #available(iOS 13, *) {
+                setIconImage()
+            }
+        #endif
     }
 }
 
@@ -162,7 +176,7 @@ final class TitleSubtitleTextfieldHeader: UIView {
     }
 
     private func setStyles() {
-        backgroundColor = .neutral(.shade5)
+        backgroundColor = .clear
     }
 
     func setTitle(_ text: String) {
diff --git a/WordPress/Classes/ViewRelated/Site Creation/SiteInfo/SiteInformationWizardContent.swift b/WordPress/Classes/ViewRelated/Site Creation/SiteInfo/SiteInformationWizardContent.swift
index 4d67025cfa09..72316b8c1daf 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/SiteInfo/SiteInformationWizardContent.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/SiteInfo/SiteInformationWizardContent.swift	
@@ -81,7 +81,7 @@ final class SiteInformationWizardContent: UIViewController {
     }
 
     private func setupBackground() {
-        view.backgroundColor = .neutral(.shade5)
+        view.backgroundColor = .listBackground
     }
 
     private func setupTable() {
@@ -97,11 +97,11 @@ final class SiteInformationWizardContent: UIViewController {
     }
 
     private func setupTableBackground() {
-        table.backgroundColor = .neutral(.shade5)
+        table.backgroundColor = .listBackground
     }
 
     private func setupTableSeparator() {
-        table.separatorColor = .neutral(.shade10)
+        table.separatorColor = .divider
     }
 
     private func registerCell() {
@@ -117,7 +117,7 @@ final class SiteInformationWizardContent: UIViewController {
     }
 
     private func setupButtonWrapper() {
-        buttonWrapper.backgroundColor = .neutral(.shade5)
+        buttonWrapper.backgroundColor = .listBackground
     }
 
     private func setupNextButton() {
@@ -287,11 +287,15 @@ extension SiteInformationWizardContent: UITableViewDataSource {
             cell.addBottomBorder(withColor: .neutral(.shade10))
         }
 
+        cell.contentView.backgroundColor = .listForeground
+
         cell.nameLabel.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
-        cell.nameLabel.textColor = .neutral(.shade70)
+        cell.nameLabel.textColor = .text
+        cell.nameLabel.backgroundColor = .listForeground
 
         cell.valueTextField.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
-        cell.valueTextField.textColor = .neutral(.shade60)
+        cell.valueTextField.textColor = .text
+        cell.valueTextField.backgroundColor = .listForeground
 
         if cell.delegate == nil {
             cell.delegate = self
@@ -300,7 +304,7 @@ extension SiteInformationWizardContent: UITableViewDataSource {
 
     private func attributedPlaceholder(text: String) -> NSAttributedString {
         let attributes: [NSAttributedString.Key: Any] = [
-            .foregroundColor: UIColor.neutral(.shade30),
+            .foregroundColor: UIColor.textPlaceholder,
             .font: WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
         ]
 
diff --git a/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift b/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift
index b8b7c06a9e41..8386f73abc4b 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/SiteSegments/SiteSegmentsWizardContent.swift	
@@ -63,7 +63,7 @@ final class SiteSegmentsWizardContent: UIViewController {
     }
 
     private func setupBackground() {
-        view.backgroundColor = .neutral(.shade5)
+        view.backgroundColor = .listBackground
     }
 
     override func viewDidLayoutSubviews() {
diff --git a/WordPress/Classes/ViewRelated/Site Creation/Verticals/NewVerticalCell.swift b/WordPress/Classes/ViewRelated/Site Creation/Verticals/NewVerticalCell.swift
index ec86d90c8709..0fdedc83aef5 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/Verticals/NewVerticalCell.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/Verticals/NewVerticalCell.swift	
@@ -30,11 +30,11 @@ final class NewVerticalCell: UITableViewCell, SiteVerticalPresenter {
 
     private func styleTitle() {
         WPStyleGuide.configureLabel(title, textStyle: .body, symbolicTraits: .traitItalic)
-        title.textColor = .neutral(.shade70)
+        title.textColor = .text
     }
 
     private func styleSubtitle() {
         subtitle.font = WPFontManager.systemRegularFont(ofSize: 15.0)
-        subtitle.textColor = .neutral(.shade30)
+        subtitle.textColor = .textSubtle
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsCell.swift b/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsCell.swift
index d307690a4cab..eb7150db66d5 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsCell.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsCell.swift	
@@ -23,7 +23,7 @@ final class VerticalsCell: UITableViewCell, SiteVerticalPresenter {
 
     private func styleTitle() {
         title.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
-        title.textColor = .neutral(.shade70)
+        title.textColor = .text
         title.adjustsFontForContentSizeCategory = true
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsWizardContent.swift b/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsWizardContent.swift
index 499dcc2c5c36..dd1525a844a8 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsWizardContent.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/Verticals/VerticalsWizardContent.swift	
@@ -291,7 +291,7 @@ final class VerticalsWizardContent: UIViewController {
     }
 
     private func setupBackground() {
-        view.backgroundColor = .neutral(.shade5)
+        view.backgroundColor = .listBackground
     }
 
     private func setupCellHeight() {
@@ -333,7 +333,7 @@ final class VerticalsWizardContent: UIViewController {
     }
 
     private func setupButtonWrapper() {
-        buttonWrapper.backgroundColor = .neutral(.shade5)
+        buttonWrapper.backgroundColor = .listBackground
     }
 
     private func setupNextButton() {
@@ -362,7 +362,7 @@ final class VerticalsWizardContent: UIViewController {
     }
 
     private func setupTableBackground() {
-        table.backgroundColor = .neutral(.shade5)
+        table.backgroundColor = .listBackground
     }
 
     private func setupTableHeaderWithPrompt(_ prompt: SiteVerticalsPrompt) {
@@ -380,7 +380,7 @@ final class VerticalsWizardContent: UIViewController {
         header.accessibilityTraits = .header
 
         let placeholderText = prompt.hint
-        let attributes = WPStyleGuide.defaultSearchBarTextAttributesSwifted(.neutral(.shade30))
+        let attributes = WPStyleGuide.defaultSearchBarTextAttributesSwifted(.textPlaceholder)
         let attributedPlaceholder = NSAttributedString(string: placeholderText, attributes: attributes)
         header.textField.attributedPlaceholder = attributedPlaceholder
         header.textField.returnKeyType = .done
@@ -408,7 +408,7 @@ final class VerticalsWizardContent: UIViewController {
     }
 
     private func setupTableSeparator() {
-        table.separatorColor = .neutral(.shade10)
+        table.separatorColor = .divider
     }
 
     private func trackVerticalSelection(_ vertical: SiteVertical) {
diff --git a/WordPress/Classes/ViewRelated/Site Creation/WebAddress/AddressCell.swift b/WordPress/Classes/ViewRelated/Site Creation/WebAddress/AddressCell.swift
index 24051fb6136c..4ec7719bf900 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/WebAddress/AddressCell.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/WebAddress/AddressCell.swift	
@@ -3,8 +3,10 @@ import WordPressKit
 
 final class AddressCell: UITableViewCell, ModelSettableCell {
     private struct TextStyleAttributes {
-        static let defaults: [NSAttributedString.Key: Any] = [.font: WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular), .foregroundColor: UIColor.neutral(.shade30)]
-        static let customName: [NSAttributedString.Key: Any] = [.font: WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular), .foregroundColor: UIColor.neutral(.shade70)]
+        static let defaults: [NSAttributedString.Key: Any] = [.font: WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular),
+                                                              .foregroundColor: UIColor.textSubtle]
+        static let customName: [NSAttributedString.Key: Any] = [.font: WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular),
+                                                                .foregroundColor: UIColor.text]
     }
 
     @IBOutlet weak var title: UILabel!
diff --git a/WordPress/Classes/ViewRelated/Site Creation/WebAddress/WebAddressWizardContent.swift b/WordPress/Classes/ViewRelated/Site Creation/WebAddress/WebAddressWizardContent.swift
index d510afe50288..16513a8388fb 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/WebAddress/WebAddressWizardContent.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/WebAddress/WebAddressWizardContent.swift	
@@ -78,7 +78,7 @@ final class WebAddressWizardContent: UIViewController {
 
             label.font = WPStyleGuide.fontForTextStyle(.title2)
             label.textAlignment = .center
-            label.textColor = .neutral(.shade40)
+            label.textColor = .text
 
             let noResultsMessage = NSLocalizedString("No available addresses matching your search", comment: "Advises the user that no Domain suggestions could be found for the search query.")
             label.text = noResultsMessage
@@ -254,11 +254,11 @@ final class WebAddressWizardContent: UIViewController {
     }
 
     private func setupBackground() {
-        view.backgroundColor = .neutral(.shade5)
+        view.backgroundColor = .listBackground
     }
 
     private func setupButtonWrapper() {
-        buttonWrapper.backgroundColor = .neutral(.shade5)
+        buttonWrapper.backgroundColor = .listBackground
     }
 
     private func setupCreateSiteButton() {
@@ -347,7 +347,7 @@ final class WebAddressWizardContent: UIViewController {
         header.accessibilityTraits = .header
 
         let placeholderText = NSLocalizedString("Search Domains", comment: "Site creation. Seelect a domain, search field placeholder")
-        let attributes = WPStyleGuide.defaultSearchBarTextAttributesSwifted(.neutral(.shade30))
+        let attributes = WPStyleGuide.defaultSearchBarTextAttributesSwifted(.textPlaceholder)
         let attributedPlaceholder = NSAttributedString(string: placeholderText, attributes: attributes)
         header.textField.attributedPlaceholder = attributedPlaceholder
 
@@ -378,11 +378,11 @@ final class WebAddressWizardContent: UIViewController {
     }
 
     private func setupTableBackground() {
-        table.backgroundColor = .neutral(.shade5)
+        table.backgroundColor = .listBackground
     }
 
     private func setupTableSeparator() {
-        table.separatorColor = .neutral(.shade10)
+        table.separatorColor = .divider
     }
 
     private func setupConstraints() {

From 784dd4054a965f4202ef38cb4e5813da6da75f4f Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 14:28:47 +0100
Subject: [PATCH 18/47] Fixe delete button

---
 .../Blog/SiteManagement/DeleteSite.storyboard | 46 ++++++++++---------
 .../DeleteSiteViewController.swift            |  8 +++-
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSite.storyboard b/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSite.storyboard
index 319f90bc1b0e..f92606a57bfb 100644
--- a/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSite.storyboard
+++ b/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSite.storyboard
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina5_5" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -24,7 +21,7 @@
                             <tableViewSection id="n0H-ts-xAM">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" id="7Uo-T8-SBI">
-                                        <rect key="frame" x="0.0" y="35" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="1" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" tableViewCell="7Uo-T8-SBI" id="4NR-59-7vR">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
@@ -67,7 +64,7 @@
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" id="lvO-X5-lOQ">
-                                        <rect key="frame" x="0.0" y="79" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="45" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" tableViewCell="lvO-X5-lOQ" id="ukM-xS-jFg">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
@@ -86,22 +83,22 @@
                                                             <rect key="frame" x="0.0" y="15.333333333333332" width="374" height="8.6666666666666679"/>
                                                             <subviews>
                                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" translatesAutoresizingMaskIntoConstraints="NO" id="J5f-IF-gpF">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="0.0" height="8.6666666666666661"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="76.666666666666671" height="8.6666666666666661"/>
                                                                     <subviews>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="• Posts" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KxO-Is-bhY">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="0.0" height="3"/>
+                                                                            <rect key="frame" x="0.0" y="0.0" width="76.666666666666671" height="3"/>
                                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                                             <nil key="textColor"/>
                                                                             <nil key="highlightedColor"/>
                                                                         </label>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="• Pages" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="peC-dR-nRG">
-                                                                            <rect key="frame" x="0.0" y="3" width="0.0" height="2.6666666666666661"/>
+                                                                            <rect key="frame" x="0.0" y="3" width="76.666666666666671" height="2.6666666666666661"/>
                                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                                             <nil key="textColor"/>
                                                                             <nil key="highlightedColor"/>
                                                                         </label>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="• Media" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N4f-Sa-CVH">
-                                                                            <rect key="frame" x="0.0" y="5.6666666666666679" width="0.0" height="3"/>
+                                                                            <rect key="frame" x="0.0" y="5.6666666666666679" width="76.666666666666671" height="3"/>
                                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                                             <nil key="textColor"/>
                                                                             <nil key="highlightedColor"/>
@@ -109,22 +106,22 @@
                                                                     </subviews>
                                                                 </stackView>
                                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" translatesAutoresizingMaskIntoConstraints="NO" id="Cmc-uu-9J9">
-                                                                    <rect key="frame" x="-20" y="0.0" width="0.0" height="8.6666666666666661"/>
+                                                                    <rect key="frame" x="126.66666666666663" y="0.0" width="247.33333333333337" height="8.6666666666666661"/>
                                                                     <subviews>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="• Users &amp; Authors" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FcP-ti-s9r">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="0.0" height="3"/>
+                                                                            <rect key="frame" x="0.0" y="0.0" width="247.33333333333334" height="3"/>
                                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                                             <nil key="textColor"/>
                                                                             <nil key="highlightedColor"/>
                                                                         </label>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="• Domains" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="760-77-2gC">
-                                                                            <rect key="frame" x="0.0" y="3" width="0.0" height="2.6666666666666661"/>
+                                                                            <rect key="frame" x="0.0" y="3" width="247.33333333333334" height="2.6666666666666661"/>
                                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                                             <nil key="textColor"/>
                                                                             <nil key="highlightedColor"/>
                                                                         </label>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="• Purchased Upgrades" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q3t-nv-OBS">
-                                                                            <rect key="frame" x="0.0" y="5.6666666666666679" width="0.0" height="3"/>
+                                                                            <rect key="frame" x="0.0" y="5.6666666666666679" width="247.33333333333334" height="3"/>
                                                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                                             <nil key="textColor"/>
                                                                             <nil key="highlightedColor"/>
@@ -146,7 +143,7 @@
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="top" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" id="HNw-3J-5iO">
-                                        <rect key="frame" x="0.0" y="123" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="89" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" tableViewCell="HNw-3J-5iO" id="8rN-Pf-TUc">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
@@ -185,19 +182,20 @@ If you're unsure about what will be deleted or need any help, not to worry, our
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" id="ppe-IO-Pij">
-                                        <rect key="frame" x="0.0" y="167" width="414" height="44"/>
+                                        <rect key="frame" x="0.0" y="133" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" tableViewCell="ppe-IO-Pij" id="JAd-hU-JNQ">
                                             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Efz-S9-pOZ">
+                                                <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Efz-S9-pOZ">
                                                     <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="o8x-CR-hFe"/>
                                                     </constraints>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                                    <state key="normal" title="Delete Site"/>
+                                                    <state key="normal" title="Delete Site">
+                                                        <color key="titleColor" name="Red50"/>
+                                                    </state>
                                                     <connections>
                                                         <action selector="deleteSite:" destination="aKn-1R-Ofg" eventType="touchUpInside" id="4eh-Wd-NzS"/>
                                                     </connections>
@@ -221,6 +219,7 @@ If you're unsure about what will be deleted or need any help, not to worry, our
                         </connections>
                     </tableView>
                     <connections>
+                        <outlet property="deleteButtonContainerView" destination="JAd-hU-JNQ" id="gRj-Mz-DSm"/>
                         <outlet property="deleteSiteButton" destination="Efz-S9-pOZ" id="u1F-wG-5U7"/>
                         <outlet property="sectionThreeBody" destination="r5O-oO-teR" id="QI6-ly-kD4"/>
                         <outlet property="sectionTwoColumnOneItem" destination="KxO-Is-bhY" id="sFW-4A-a2R"/>
@@ -249,5 +248,8 @@ If you're unsure about what will be deleted or need any help, not to worry, our
     </scenes>
     <resources>
         <image name="icon-alert" width="62" height="52"/>
+        <namedColor name="Red50">
+            <color red="0.83921568627450982" green="0.21176470588235294" blue="0.2196078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>
diff --git a/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSiteViewController.swift b/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSiteViewController.swift
index 95f7dbdd60a8..df5a6184050c 100644
--- a/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSiteViewController.swift
+++ b/WordPress/Classes/ViewRelated/Blog/SiteManagement/DeleteSiteViewController.swift
@@ -37,6 +37,7 @@ open class DeleteSiteViewController: UITableViewController {
     @IBOutlet fileprivate weak var sectionThreeBody: UILabel!
     @IBOutlet fileprivate weak var supportButton: UIButton!
     @IBOutlet fileprivate weak var deleteSiteButton: UIButton!
+    @IBOutlet private var deleteButtonContainerView: UIView!
 
     // MARK: - View Lifecycle
 
@@ -151,10 +152,15 @@ open class DeleteSiteViewController: UITableViewController {
     /// One time setup of fourth section (delete button)
     ///
     fileprivate func setupDeleteButton() {
+        deleteButtonContainerView.backgroundColor = .listForeground
+
         let trashIcon = Gridicon.iconOfType(.trash)
         deleteSiteButton.setTitle(NSLocalizedString("Delete Site", comment: "Button label for deleting the current site"), for: .normal)
         deleteSiteButton.tintColor = .error
-        deleteSiteButton.setImage(trashIcon, for: .normal)
+        deleteSiteButton.setImage(trashIcon.imageWithTintColor(.error), for: .normal)
+        deleteSiteButton.setImage(trashIcon.imageWithTintColor(.error(.shade70)), for: .highlighted)
+        deleteSiteButton.setTitleColor(.error, for: .normal)
+        deleteSiteButton.setTitleColor(.error(.shade70), for: .highlighted)
         deleteSiteButton.titleLabel?.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .semibold)
     }
 

From 325640ad6021f0533117e8067db130d7855d36db Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 15:21:28 +0100
Subject: [PATCH 19/47] Fix QuickStart

---
 .../Blog/BlogDetailsSectionHeaderView.swift   |  7 ++++++-
 .../Blog/BlogDetailsSectionHeaderView.xib     | 18 +++++++++-------
 .../Blog/QuickStartChecklistCell.swift        | 21 ++++++++++++++-----
 .../Blog/QuickStartChecklistHeader.swift      | 14 +++++++++++--
 .../Blog/QuickStartChecklistHeader.xib        |  9 ++++----
 .../QuickStartChecklistViewController.swift   |  3 ++-
 .../Blog/QuickStartCongratulationsCell.xib    | 14 ++++++-------
 .../Blog/QuickStartListTitleCell.xib          | 18 +++++++---------
 8 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.swift b/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.swift
index 77008dc3f235..98aae961a073 100644
--- a/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.swift
+++ b/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.swift
@@ -6,7 +6,7 @@ class BlogDetailsSectionHeaderView: UITableViewHeaderFooterView {
 
     @objc @IBOutlet private(set) var ellipsisButton: UIButton? {
         didSet {
-            ellipsisButton?.setImage(Gridicon.iconOfType(.ellipsis).imageWithTintColor(.neutral(.shade30)), for: .normal)
+            ellipsisButton?.setImage(Gridicon.iconOfType(.ellipsis).imageWithTintColor(.listIcon), for: .normal)
         }
     }
 
@@ -18,6 +18,11 @@ class BlogDetailsSectionHeaderView: UITableViewHeaderFooterView {
 
     @objc var ellipsisButtonDidTouch: EllipsisCallback?
 
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        titleLabel?.textColor = .textSubtle
+    }
+
     @IBAction func ellipsisTapped() {
         ellipsisButtonDidTouch?(self)
     }
diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.xib b/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.xib
index 6c9450ee1dcd..ff35b88b00b5 100644
--- a/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.xib
+++ b/WordPress/Classes/ViewRelated/Blog/BlogDetailsSectionHeaderView.xib
@@ -1,11 +1,10 @@
 <?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="14865.1" 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="14819.2"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -27,9 +26,9 @@
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DATE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eUE-Sb-m3L">
                     <rect key="frame" x="16" y="0.0" width="32.5" height="36"/>
-                    <color key="backgroundColor" red="0.91372549020000005" green="0.93725490199999995" blue="0.95294117649999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                    <color key="textColor" red="0.30980392159999998" green="0.4549019608" blue="0.5568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="textColor" name="Gray50"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
@@ -52,4 +51,9 @@
             <point key="canvasLocation" x="233.59999999999999" y="186.20689655172416"/>
         </view>
     </objects>
+    <resources>
+        <namedColor name="Gray50">
+            <color red="0.40392156862745099" green="0.41568627450980394" blue="0.45490196078431372" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
 </document>
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistCell.swift b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistCell.swift
index 9779350bd90f..46174729f216 100644
--- a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistCell.swift
+++ b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistCell.swift
@@ -12,8 +12,16 @@ class QuickStartChecklistCell: UITableViewCell {
         }
     }
     @IBOutlet private var iconView: UIImageView?
-    @IBOutlet private var stroke: UIView?
-    @IBOutlet private var topSeparator: UIView?
+    @IBOutlet private var stroke: UIView? {
+        didSet {
+            stroke?.backgroundColor = .divider
+        }
+    }
+    @IBOutlet private var topSeparator: UIView? {
+        didSet {
+            topSeparator?.backgroundColor = .divider
+        }
+    }
 
     private var bottomStrokeLeading: NSLayoutConstraint?
     private var contentViewLeadingAnchor: NSLayoutXAxisAnchor {
@@ -34,9 +42,11 @@ class QuickStartChecklistCell: UITableViewCell {
                                                                attributes: [.strikethroughStyle: 1,
                                                                             .foregroundColor: UIColor.neutral(.shade30)])
                 descriptionLabel.textColor = .neutral(.shade30)
+                iconView?.tintColor = .neutral(.shade30)
             } else {
-                titleLabel.textColor = .neutral(.shade70)
-                descriptionLabel.textColor = .neutral(.shade70)
+                titleLabel.textColor = .text
+                descriptionLabel.textColor = .textSubtle
+                iconView?.tintColor = .listIcon
             }
         }
     }
@@ -44,7 +54,7 @@ class QuickStartChecklistCell: UITableViewCell {
         didSet {
             titleLabel.text = tour?.title
             descriptionLabel.text = tour?.description
-            iconView?.image = tour?.icon.imageWithTintColor(.neutral(.shade20))
+            iconView?.image = tour?.icon.withRenderingMode(.alwaysTemplate)
 
             if let hint = tour?.accessibilityHintText, !hint.isEmpty {
                 accessibilityHint = hint
@@ -67,6 +77,7 @@ class QuickStartChecklistCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        contentView.backgroundColor = .listForeground
         setupConstraints()
     }
 
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.swift b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.swift
index b2607c8056ba..80d1a7d89a48 100644
--- a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.swift
+++ b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.swift
@@ -34,10 +34,19 @@ class QuickStartChecklistHeader: UIView {
     @IBOutlet private var chevronView: UIImageView! {
         didSet {
             chevronView.image = Gridicon.iconOfType(.chevronDown)
-            chevronView.tintColor = WPStyleGuide.cellGridiconAccessoryColor()
+            chevronView.tintColor = .textTertiary
+        }
+    }
+    @IBOutlet var topStroke: UIView! {
+        didSet {
+            topStroke.backgroundColor = .divider
+        }
+    }
+    @IBOutlet private var bottomStroke: UIView! {
+        didSet {
+            bottomStroke.backgroundColor = .divider
         }
     }
-    @IBOutlet private var bottomStroke: UIView!
     @IBOutlet private var contentView: UIView! {
         didSet {
             contentView.leadingAnchor.constraint(equalTo: contentViewLeadingAnchor).isActive = true
@@ -59,6 +68,7 @@ class QuickStartChecklistHeader: UIView {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        contentView.backgroundColor = .listForeground
         prepareForVoiceOver()
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.xib b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.xib
index 58032062f97f..011b1c08eb5d 100644
--- a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.xib
+++ b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistHeader.xib
@@ -1,11 +1,9 @@
 <?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" 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="14865.1" 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="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -97,6 +95,7 @@
                 <outlet property="chevronView" destination="2ag-iN-nJf" id="fe5-yH-BhN"/>
                 <outlet property="contentView" destination="rkz-KZ-Ayy" id="NET-gR-3xr"/>
                 <outlet property="titleLabel" destination="xiK-ca-ccq" id="HrR-PQ-Mtc"/>
+                <outlet property="topStroke" destination="QaU-FW-PcA" id="X0k-sy-5Eo"/>
             </connections>
             <point key="canvasLocation" x="53.600000000000001" y="48.575712143928037"/>
         </view>
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistViewController.swift b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistViewController.swift
index b619b7f1579d..1716cd5816d2 100644
--- a/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistViewController.swift
+++ b/WordPress/Classes/ViewRelated/Blog/QuickStartChecklistViewController.swift
@@ -51,7 +51,7 @@ class QuickStartChecklistViewController: UITableViewController {
     private lazy var successScreen: NoResultsViewController = {
         let successScreen = NoResultsViewController.controller()
         successScreen.view.frame = tableView.bounds
-        successScreen.view.backgroundColor = .white
+        successScreen.view.backgroundColor = .listBackground
         successScreen.configure(title: tasksCompleteScreen.title,
                                 subtitle: tasksCompleteScreen.subtitle,
                                 image: tasksCompleteScreen.imageName)
@@ -151,6 +151,7 @@ private extension QuickStartChecklistViewController {
 
         tableView.backgroundView = successScreen.view
         self.tableView = tableView
+        WPStyleGuide.configureTableViewColors(view: self.tableView)
     }
 
     func startObservingForQuickStart() {
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartCongratulationsCell.xib b/WordPress/Classes/ViewRelated/Blog/QuickStartCongratulationsCell.xib
index 16252fec96a5..234ef11a91dc 100644
--- a/WordPress/Classes/ViewRelated/Blog/QuickStartCongratulationsCell.xib
+++ b/WordPress/Classes/ViewRelated/Blog/QuickStartCongratulationsCell.xib
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" 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="14865.1" 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="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,11 +13,11 @@
             <rect key="frame" x="0.0" y="0.0" width="428" height="88"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ZK2-Xw-LEM" id="HIE-6E-scc">
-                <rect key="frame" x="0.0" y="0.0" width="428" height="87.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="428" height="88"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tmx-Sd-E9i">
-                        <rect key="frame" x="16" y="16" width="396" height="35.5"/>
+                        <rect key="frame" x="16" y="16" width="396" height="36"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="18" id="719-qw-JbX"/>
                         </constraints>
@@ -28,7 +26,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lKH-i8-Ftz">
-                        <rect key="frame" x="16" y="53.5" width="396" height="18"/>
+                        <rect key="frame" x="16" y="54" width="396" height="18"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="18" id="Mq1-m6-Bag"/>
                         </constraints>
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartListTitleCell.xib b/WordPress/Classes/ViewRelated/Blog/QuickStartListTitleCell.xib
index 3262b7c51e79..afa3572909fb 100644
--- a/WordPress/Classes/ViewRelated/Blog/QuickStartListTitleCell.xib
+++ b/WordPress/Classes/ViewRelated/Blog/QuickStartListTitleCell.xib
@@ -1,11 +1,9 @@
 <?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="14865.1" 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="14819.2"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,18 +13,18 @@
             <rect key="frame" x="0.0" y="0.0" width="387" height="59"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="yxe-JV-A3j" id="bAc-r5-9Gc">
-                <rect key="frame" x="0.0" y="0.0" width="387" height="58.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="387" height="59"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0G7-da-TFG" customClass="CircularImageView" customModule="WordPress" customModuleProvider="target">
-                        <rect key="frame" x="16" y="11.5" width="38" height="38"/>
+                        <rect key="frame" x="16" y="11" width="38" height="38"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="38" id="fAA-Kg-A8Z"/>
                             <constraint firstAttribute="height" constant="38" id="vXF-aG-DCz"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="74y-RA-tA4">
-                        <rect key="frame" x="70" y="9.5" width="297" height="22"/>
+                        <rect key="frame" x="70" y="9" width="297" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="Sfz-hK-WdF"/>
                         </constraints>
@@ -35,7 +33,7 @@
                         <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="4zs-C7-CtU">
-                        <rect key="frame" x="70" y="32.5" width="297" height="20"/>
+                        <rect key="frame" x="70" y="32" width="297" height="20"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="aeZ-6J-P0C"/>
                         </constraints>
@@ -44,7 +42,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="2gT-Ue-Edc">
-                        <rect key="frame" x="23" y="18.5" width="24" height="24"/>
+                        <rect key="frame" x="23" y="18" width="24" height="24"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="24" id="D3x-JW-Pwt"/>
                             <constraint firstAttribute="height" constant="24" id="E8H-Nu-AhZ"/>

From 670a91d44de6f716d8907fcc1d20abde9057464b Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Thu, 5 Sep 2019 12:53:51 -0600
Subject: [PATCH 20/47] Add Dark Mode to Acknowledgements

---
 Podfile      | 6 ++++++
 Podfile.lock | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Podfile b/Podfile
index 856009c3aa3f..8cd3f155a95b 100644
--- a/Podfile
+++ b/Podfile
@@ -225,6 +225,12 @@ target 'WordPress' do
                              color: #1a1a1a;
                              margin: 20px;
                            }
+                          @media (prefers-color-scheme: dark) {
+                           body {
+                            background: #1a1a1a;
+                            color: white;
+                           }
+                          }
                            pre {
                             white-space: pre-wrap;
                            }
diff --git a/Podfile.lock b/Podfile.lock
index 941848aa890b..f43be92324be 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -498,6 +498,6 @@ SPEC CHECKSUMS:
   ZendeskSDK: c2e49fd16a73e43e490f777cea67dd852b819ace
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: 9c9af060526c5d415e2bff2c692aa90decc919f1
+PODFILE CHECKSUM: 9c46a324376bd305518558e4bbe83348eefa7024
 
 COCOAPODS: 1.6.1

From 65e33e20446fe2c711750adedc3ed88a31b54fc1 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Fri, 6 Sep 2019 09:55:42 -0600
Subject: [PATCH 21/47] =?UTF-8?q?Fix=20vertical=20alignment=20for=20?=
 =?UTF-8?q?=E2=80=9CAcknowledgements=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Utility/WebViewControllerFactory.swift    |  6 ++++++
 .../ViewRelated/Me/AboutViewController.swift  | 21 +++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/WordPress/Classes/Utility/WebViewControllerFactory.swift b/WordPress/Classes/Utility/WebViewControllerFactory.swift
index 917681cb554e..79715b1580ee 100644
--- a/WordPress/Classes/Utility/WebViewControllerFactory.swift
+++ b/WordPress/Classes/Utility/WebViewControllerFactory.swift
@@ -15,6 +15,12 @@ class WebViewControllerFactory: NSObject {
         return controller(configuration: configuration)
     }
 
+    @objc static func controller(url: URL, title: String) -> UIViewController {
+        let configuration = WebViewControllerConfiguration(url: url)
+        configuration.customTitle = title
+        return controller(configuration: configuration)
+    }
+
     @objc static func controller(url: URL, blog: Blog) -> UIViewController {
         let configuration = WebViewControllerConfiguration(url: url)
         configuration.authenticate(blog: blog)
diff --git a/WordPress/Classes/ViewRelated/Me/AboutViewController.swift b/WordPress/Classes/ViewRelated/Me/AboutViewController.swift
index bf3ea1031254..c2762fba4531 100644
--- a/WordPress/Classes/ViewRelated/Me/AboutViewController.swift
+++ b/WordPress/Classes/ViewRelated/Me/AboutViewController.swift
@@ -141,12 +141,20 @@ open class AboutViewController: UITableViewController {
         displayWebView(URL(string: urlString))
     }
 
-    private func displayWebView(_ url: URL?) {
+    private func displayWebView(_ url: URL?, title: String? = nil) {
         guard let url = url else {
             return
         }
 
-        let webViewController = WebViewControllerFactory.controller(url: url)
+        if let title = title {
+            present(webViewController: WebViewControllerFactory.controller(url: url, title: title))
+        }
+        else {
+            present(webViewController: WebViewControllerFactory.controller(url: url))
+        }
+    }
+
+    private func present(webViewController: UIViewController) {
         if presentingViewController != nil {
             navigationController?.pushViewController(webViewController, animated: true)
         } else {
@@ -202,6 +210,8 @@ open class AboutViewController: UITableViewController {
     fileprivate var rows: [[Row]] {
         let appsBlogHostname = URL(string: WPAutomatticAppsBlogURL)?.host ?? String()
 
+        let acknowledgementsString = NSLocalizedString("Acknowledgements", comment: "Displays the list of third-party libraries we use")
+
         return [
             [
                 Row(title: NSLocalizedString("Version", comment: "Displays the version of the App"),
@@ -233,9 +243,12 @@ open class AboutViewController: UITableViewController {
                     details: nil,
                     handler: { self.displayWebView(WPGithubMainURL) }),
 
-                Row(title: NSLocalizedString("Acknowledgements", comment: "Displays the list of third-party libraries we use"),
+                Row(title: acknowledgementsString,
                     details: nil,
-                    handler: { self.displayWebView(Bundle.main.url(forResource: "acknowledgements", withExtension: "html")) }),
+                    handler: {
+                        let url = Bundle.main.url(forResource: "acknowledgements", withExtension: "html")
+                        self.displayWebView(url, title: acknowledgementsString)
+                }),
             ]
         ]
     }

From a5d597a8be24f69719f37e0fbade1b40db7fcc55 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Fri, 6 Sep 2019 09:55:56 -0600
Subject: [PATCH 22/47] =?UTF-8?q?Don=E2=80=99t=20repeat=20=E2=80=9CAcknowl?=
 =?UTF-8?q?edgements=E2=80=9D=20as=20H1=20in=20the=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Podfile      | 2 +-
 Podfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Podfile b/Podfile
index 8cd3f155a95b..5db05b8b25cc 100644
--- a/Podfile
+++ b/Podfile
@@ -244,7 +244,7 @@ target 'WordPress' do
                        </body>"
           
           ## Remove the <h1>, since we've promoted it to <title>
-          styled_html = styled_html.sub("<h1>#{acknowledgements}</h1>", '')
+          styled_html = styled_html.sub("<h1>Acknowledgements</h1>", '')
           
           ## The glog library's license contains a URL that does not wrap in the web view,
           ## leading to a large right-hand whitespace gutter.  Work around this by explicitly
diff --git a/Podfile.lock b/Podfile.lock
index f43be92324be..a57225336c7b 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -498,6 +498,6 @@ SPEC CHECKSUMS:
   ZendeskSDK: c2e49fd16a73e43e490f777cea67dd852b819ace
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: 9c46a324376bd305518558e4bbe83348eefa7024
+PODFILE CHECKSUM: eb2662b2d1884c3526e73b23c2e5a9304da88f1d
 
 COCOAPODS: 1.6.1

From aa656a8c9917782cdf8465b2fa1e6514db6f7456 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 16:56:39 +0100
Subject: [PATCH 23/47] Fix plugins colors

---
 .../ViewRelated/Cells/ExpandableCell.swift     |  4 +++-
 .../Cells/TextWithAccessoryButtonCell.swift    |  6 +++++-
 .../Plugins/PluginDetailViewHeaderCell.swift   |  4 ++--
 .../PluginDirectoryCollectionViewCell.swift    |  1 -
 .../PluginDirectoryCollectionViewCell.xib      | 10 ++++------
 .../ViewRelated/Plugins/PluginListCell.xib     | 18 +++++++-----------
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift b/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift
index fb16c6514847..4c413001d149 100644
--- a/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift
+++ b/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift
@@ -57,7 +57,7 @@ class ExpandableCell: WPReusableTableViewCell {
         chevronImageView?.image = Gridicon.iconOfType(.chevronDown)
         chevronImageView?.tintColor = WPStyleGuide.cellGridiconAccessoryColor()
 
-        titleTextLabel?.textColor = .neutral(.shade70)
+        titleTextLabel?.textColor = .text
 
         let linkAttributes: [NSAttributedString.Key: Any] = [.foregroundColor: UIColor.primary,
                                                              .underlineStyle: 0,
@@ -67,6 +67,8 @@ class ExpandableCell: WPReusableTableViewCell {
         expandableTextView?.delegate = self
         expandableTextView?.textContainerInset = .zero
         expandableTextView?.textContainer.lineFragmentPadding = 0
+        expandableTextView?.textColor = .text
+        expandableTextView?.backgroundColor = .clear
     }
 
 }
diff --git a/WordPress/Classes/ViewRelated/Cells/TextWithAccessoryButtonCell.swift b/WordPress/Classes/ViewRelated/Cells/TextWithAccessoryButtonCell.swift
index a7b17a605252..8c009eaff363 100644
--- a/WordPress/Classes/ViewRelated/Cells/TextWithAccessoryButtonCell.swift
+++ b/WordPress/Classes/ViewRelated/Cells/TextWithAccessoryButtonCell.swift
@@ -13,7 +13,11 @@ class TextWithAccessoryButtonCell: WPReusableTableViewCell {
         }
     }
 
-    @IBOutlet private var mainLabel: UILabel?
+    @IBOutlet private var mainLabel: UILabel? {
+        didSet {
+            mainLabel?.textColor = .textSubtle
+        }
+    }
     @IBOutlet private var secondaryLabel: UILabel?
     @IBOutlet public private(set) var button: NUXButton?
 
diff --git a/WordPress/Classes/ViewRelated/Plugins/PluginDetailViewHeaderCell.swift b/WordPress/Classes/ViewRelated/Plugins/PluginDetailViewHeaderCell.swift
index f6c5c9231b05..06d550d6bbc3 100644
--- a/WordPress/Classes/ViewRelated/Plugins/PluginDetailViewHeaderCell.swift
+++ b/WordPress/Classes/ViewRelated/Plugins/PluginDetailViewHeaderCell.swift
@@ -10,7 +10,7 @@ class PluginDetailViewHeaderCell: UITableViewCell {
     }
 
     open func configureCell(_ directoryEntry: PluginDirectoryEntry) {
-        contentView.backgroundColor = .neutral(.shade0)
+        contentView.backgroundColor = .listForeground
 
         if let banner = directoryEntry.banner {
             headerImageView?.isHidden = false
@@ -21,7 +21,7 @@ class PluginDetailViewHeaderCell: UITableViewCell {
 
         let iconPlaceholder = Gridicon.iconOfType(.plugins, withSize: CGSize(width: 40, height: 40))
         iconImageView?.downloadImage(from: directoryEntry.icon, placeholderImage: iconPlaceholder)
-        iconImageView?.backgroundColor = .neutral(.shade0)
+        iconImageView?.backgroundColor = .listForeground
         iconImageView?.tintColor = .neutral
 
         nameLabel?.text = directoryEntry.name
diff --git a/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.swift b/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.swift
index 5860f00adc07..dbfc5d880357 100644
--- a/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.swift
@@ -26,7 +26,6 @@ class PluginDirectoryCollectionViewCell: UICollectionViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-
         nameLabel.font = WPStyleGuide.subtitleFontBold()
         logoImageView.tintColor = WPStyleGuide.cellGridiconAccessoryColor()
     }
diff --git a/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.xib b/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.xib
index 8bb52dbc2218..101ffd9014b9 100644
--- a/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.xib
+++ b/WordPress/Classes/ViewRelated/Plugins/PluginDirectoryCollectionViewCell.xib
@@ -1,11 +1,9 @@
 <?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" 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="14865.1" 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="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -37,7 +35,7 @@ with long title</string>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="huw-bc-DnN" secondAttribute="trailing" id="Mhr-k4-l9t"/>
                 <constraint firstItem="kDU-L0-NYI" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Rrv-tf-Udl"/>
diff --git a/WordPress/Classes/ViewRelated/Plugins/PluginListCell.xib b/WordPress/Classes/ViewRelated/Plugins/PluginListCell.xib
index 1422c36a615a..f7c7d0762aff 100644
--- a/WordPress/Classes/ViewRelated/Plugins/PluginListCell.xib
+++ b/WordPress/Classes/ViewRelated/Plugins/PluginListCell.xib
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" 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="14865.1" 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="13772"/>
-        <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,7 +13,7 @@
             <rect key="frame" x="0.0" y="0.0" width="643" height="72"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="9JL-Ab-5ka" id="Zhb-0F-wJw">
-                <rect key="frame" x="0.0" y="0.0" width="643" height="71.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="643" height="72"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="RK4-vT-k2f">
@@ -28,7 +24,7 @@
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Jetpack" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F0c-Qp-f0w">
-                        <rect key="frame" x="72" y="15" width="535" height="20.5"/>
+                        <rect key="frame" x="72" y="15" width="540" height="20.5"/>
                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                         <color key="textColor" red="0.18039215689999999" green="0.2666666667" blue="0.32549019610000002" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -40,8 +36,8 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKA-Hi-YBp" userLabel="accessoryViewContainer">
-                        <rect key="frame" x="151.5" y="41.5" width="475.5" height="14"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <rect key="frame" x="151.5" y="42" width="475.5" height="14"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="14" id="Oog-o2-yXz"/>
                         </constraints>

From d8a4fa0540998a3ccc457ea3bcc400a29a2c5be1 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 6 Sep 2019 19:04:48 +0100
Subject: [PATCH 24/47] Fix text color

---
 WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift    | 1 -
 WordPress/Classes/ViewRelated/Plugins/PluginViewModel.swift | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift b/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift
index 4c413001d149..ebe9aaf8a2a8 100644
--- a/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift
+++ b/WordPress/Classes/ViewRelated/Cells/ExpandableCell.swift
@@ -67,7 +67,6 @@ class ExpandableCell: WPReusableTableViewCell {
         expandableTextView?.delegate = self
         expandableTextView?.textContainerInset = .zero
         expandableTextView?.textContainer.lineFragmentPadding = 0
-        expandableTextView?.textColor = .text
         expandableTextView?.backgroundColor = .clear
     }
 
diff --git a/WordPress/Classes/ViewRelated/Plugins/PluginViewModel.swift b/WordPress/Classes/ViewRelated/Plugins/PluginViewModel.swift
index 9dbeb4ba9ca4..2bef3484f0ad 100644
--- a/WordPress/Classes/ViewRelated/Plugins/PluginViewModel.swift
+++ b/WordPress/Classes/ViewRelated/Plugins/PluginViewModel.swift
@@ -562,7 +562,7 @@ class PluginViewModel: Observable {
             guard let font = value as? UIFont, font.familyName == "Times New Roman" else { return }
 
             copy.addAttribute(.font, value: WPStyleGuide.subtitleFont(), range: range)
-            copy.addAttribute(.foregroundColor, value: UIColor.neutral(.shade70), range: range)
+            copy.addAttribute(.foregroundColor, value: UIColor.text, range: range)
         }
 
 

From 5e328fedbd933fafd5b052275e06912b349633df Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Fri, 6 Sep 2019 18:18:28 -0600
Subject: [PATCH 25/47] Tag 3.2.1.1

---
 config/Version.public.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig
index 17e7dd7618cb..c8a1f8f91465 100644
--- a/config/Version.public.xcconfig
+++ b/config/Version.public.xcconfig
@@ -1,4 +1,4 @@
 VERSION_SHORT=13.2.1
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=13.2.1.0
+VERSION_LONG=13.2.1.1

From b9bbc3b41a186154c8e3f8eb16c2fd7ec58b4065 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Sat, 7 Sep 2019 10:01:52 +0100
Subject: [PATCH 26/47] Fix site creation flow colors

---
 .../Site Creation/FinalAssembly/AssembledSiteView.swift   | 6 +++---
 .../FinalAssembly/SiteAssemblyContentView.swift           | 8 ++++----
 .../Site Creation/Shared/TitleSubtitleHeader.swift        | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/AssembledSiteView.swift b/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/AssembledSiteView.swift
index b52cf8b04fdb..14ec160b46f5 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/AssembledSiteView.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/AssembledSiteView.swift	
@@ -83,11 +83,11 @@ final class AssembledSiteView: UIView {
 
             textField.translatesAutoresizingMaskIntoConstraints = false
 
-            textField.backgroundColor = .neutral(.shade5)
+            textField.backgroundColor = .listBackground
             textField.font = WPStyleGuide.fontForTextStyle(.footnote)
             textField.isEnabled = false
             textField.textAlignment = .center
-            textField.textColor = .neutral(.shade70)
+            textField.textColor = .textSubtle
             textField.text = domainName
 
             textField.layer.cornerRadius = Parameters.textFieldCornerRadius
@@ -102,7 +102,7 @@ final class AssembledSiteView: UIView {
 
             activityIndicator.translatesAutoresizingMaskIntoConstraints = false
             activityIndicator.hidesWhenStopped = true
-            activityIndicator.color = .neutral(.shade40)
+            activityIndicator.color = .textSubtle
             activityIndicator.startAnimating()
 
             return activityIndicator
diff --git a/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift b/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift
index c1a3b305f52c..b363284b1c49 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyContentView.swift	
@@ -90,7 +90,7 @@ final class SiteAssemblyContentView: UIView {
             label.numberOfLines = 0
 
             label.font = WPStyleGuide.fontForTextStyle(.title1, fontWeight: .bold)
-            label.textColor = .neutral(.shade70)
+            label.textColor = .text
             label.textAlignment = .center
 
             let createdText = NSLocalizedString("Your site has been created!",
@@ -108,7 +108,7 @@ final class SiteAssemblyContentView: UIView {
             label.numberOfLines = 0
 
             label.font = WPStyleGuide.fontForTextStyle(.title2)
-            label.textColor = .neutral(.shade40)
+            label.textColor = .textSubtle
             label.textAlignment = .center
 
             let statusText = NSLocalizedString("We’re creating your new site.",
@@ -124,7 +124,7 @@ final class SiteAssemblyContentView: UIView {
 
             activityIndicator.translatesAutoresizingMaskIntoConstraints = false
             activityIndicator.hidesWhenStopped = true
-            activityIndicator.color = .neutral(.shade40)
+            activityIndicator.color = .textSubtle
             activityIndicator.startAnimating()
 
             return activityIndicator
@@ -185,7 +185,7 @@ final class SiteAssemblyContentView: UIView {
         translatesAutoresizingMaskIntoConstraints = true
         autoresizingMask = [ .flexibleWidth, .flexibleHeight ]
 
-        backgroundColor = .neutral(.shade5)
+        backgroundColor = .listBackground
 
         statusStackView.addArrangedSubviews([ statusLabel, activityIndicator ])
         addSubviews([ completionLabel, statusStackView ])
diff --git a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift
index 76ebe36d2198..a0a3a2107e4f 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleHeader.swift	
@@ -76,12 +76,12 @@ final class TitleSubtitleHeader: UIView {
 
     private func styleTitle() {
         titleLabel.font = WPStyleGuide.fontForTextStyle(.title1, fontWeight: .bold)
-        titleLabel.textColor = .neutral(.shade70)
+        titleLabel.textColor = .text
     }
 
     private func styleSubtitle() {
         subtitleLabel.font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .regular)
-        subtitleLabel.textColor = .neutral(.shade40)
+        subtitleLabel.textColor = .textSubtle
     }
 
     func setTitle(_ text: String) {

From 1e1e6913be7e92bb2b9afdc9b0773c19782f0578 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Sat, 7 Sep 2019 10:37:19 +0100
Subject: [PATCH 27/47] Fix activities cell labels color

---
 .../ViewRelated/Activity/ActivityListViewController.swift     | 1 +
 .../Classes/ViewRelated/Activity/ActivityTableViewCell.swift  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Activity/ActivityListViewController.swift b/WordPress/Classes/ViewRelated/Activity/ActivityListViewController.swift
index 43214b72bd54..0d559cce3106 100644
--- a/WordPress/Classes/ViewRelated/Activity/ActivityListViewController.swift
+++ b/WordPress/Classes/ViewRelated/Activity/ActivityListViewController.swift
@@ -127,6 +127,7 @@ extension ActivityListViewController {
             return nil
         }
 
+        cell.separator.isHidden = true
         cell.titleLabel.text = NSLocalizedString("Since you're on a free plan, you'll see limited events in your Activity Log.", comment: "Text displayed as a footer of a table view with Activities when user is on a free plan")
 
         return cell
diff --git a/WordPress/Classes/ViewRelated/Activity/ActivityTableViewCell.swift b/WordPress/Classes/ViewRelated/Activity/ActivityTableViewCell.swift
index 30c68f240f65..494349c0f172 100644
--- a/WordPress/Classes/ViewRelated/Activity/ActivityTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Activity/ActivityTableViewCell.swift
@@ -26,8 +26,8 @@ open class ActivityTableViewCell: WPTableViewCell {
         summaryLabel.text = activity.summary
         contentLabel.text = activity.text
 
-        summaryLabel.textColor = .text
-        contentLabel.textColor = .textSubtle
+        summaryLabel.textColor = .textSubtle
+        contentLabel.textColor = .text
 
         iconBackgroundImageView.backgroundColor = Style.getColorByActivityStatus(activity)
         if let iconImage = Style.getIconForActivity(activity) {

From 0c6f227eaeb5f66507316589cef75a90f33cc4fe Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Sat, 7 Sep 2019 10:39:10 +0100
Subject: [PATCH 28/47] Plan cell detail label color

---
 WordPress/Classes/ViewRelated/Plans/PlanListRow.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/Plans/PlanListRow.swift b/WordPress/Classes/ViewRelated/Plans/PlanListRow.swift
index 6ab3826bf570..dd97a7446b34 100644
--- a/WordPress/Classes/ViewRelated/Plans/PlanListRow.swift
+++ b/WordPress/Classes/ViewRelated/Plans/PlanListRow.swift
@@ -22,7 +22,7 @@ struct PlanListRow: ImmuTableRow {
         cell.textLabel?.attributedText = attributedTitle
         cell.textLabel?.adjustsFontSizeToFitWidth = true
         cell.detailTextLabel?.text = description
-        cell.detailTextLabel?.textColor = .neutral(.shade30)
+        cell.detailTextLabel?.textColor = .textSubtle
         cell.detailTextLabel?.font = WPFontManager.systemRegularFont(ofSize: 14.0)
         cell.separatorInset = UIEdgeInsets.zero
         cell.backgroundColor = .listForeground

From d5abc789b5aedd9a80ef58510ce7dd6c23fd8f11 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Sat, 7 Sep 2019 10:56:14 +0100
Subject: [PATCH 29/47] Fix sharing colors

---
 WordPress/Classes/ViewRelated/Blog/SettingTableViewCell.m       | 2 +-
 .../Classes/ViewRelated/Blog/SharingButtonsViewController.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Blog/SettingTableViewCell.m b/WordPress/Classes/ViewRelated/Blog/SettingTableViewCell.m
index 941ceed5fbd1..b2913b380470 100644
--- a/WordPress/Classes/ViewRelated/Blog/SettingTableViewCell.m
+++ b/WordPress/Classes/ViewRelated/Blog/SettingTableViewCell.m
@@ -14,7 +14,7 @@ - (instancetype)initWithLabel:(NSString *)label editable:(BOOL)editable reuseIde
     if (self) {
         self.textLabel.text = label;
         [WPStyleGuide configureTableViewCell:self];
-        self.detailTextLabel.textColor = [UIColor murielNeutral30];
+        self.detailTextLabel.textColor = [UIColor murielTextSubtle];
         if (editable) {
             self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
             self.selectionStyle = UITableViewCellSelectionStyleDefault;
diff --git a/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift b/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift
index 9d576626f8d9..181ee8056de8 100644
--- a/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift
+++ b/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift
@@ -373,7 +373,7 @@ import WordPressShared
         cell.editingAccessoryView = cell.accessoryView
         cell.editingAccessoryType = cell.accessoryType
         cell.imageView?.image = self.iconForSharingButton(button)
-        cell.imageView?.tintColor = .neutral(.shade10)
+        cell.imageView?.tintColor = .listIcon
         cell.textLabel?.text = button.name
     }
 

From 05dcf985481f91b540defd51dccbe7ab631bf724 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Sat, 7 Sep 2019 20:49:40 +0100
Subject: [PATCH 30/47] Fix menus colors

---
 .../UIColor+MurielColorsObjC.swift                  | 10 ++++++++++
 .../ViewRelated/Menus/MenuDetailsViewController.m   | 13 +++++++++----
 .../ViewRelated/Menus/MenuItemAbstractView.m        |  5 +++--
 .../ViewRelated/Menus/MenusSelectionDetailView.m    |  2 +-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift
index 69168bdb449c..b1b2a62b0180 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift	
@@ -61,6 +61,11 @@
         return .neutral(.shade70)
     }
 
+    @available(swift, obsoleted: 1.0)
+    static func murielNeutral80() -> UIColor {
+        return .neutral(.shade80)
+    }
+
     @available(swift, obsoleted: 1.0)
     static func murielSuccess() -> UIColor {
         return .success
@@ -76,6 +81,11 @@
         return .textSubtle
     }
 
+    @available(swift, obsoleted: 1.0)
+    static func murielTextTertiary() -> UIColor {
+        return .textTertiary
+    }
+
     @available(swift, obsoleted: 1.0)
     static func murielAccent() -> UIColor {
         return .accent
diff --git a/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m b/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m
index d2b29571f7d5..ebb56bb51b53 100644
--- a/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m
@@ -52,7 +52,8 @@ - (void)setupTextField
 {
     UITextField *textField = self.textField;
     textField.placeholder = NSLocalizedString(@"Menu Name", @"Menus placeholder text for the name field of a menu with no name.");
-    textField.textColor = [UIColor murielNeutral70];
+    textField.textColor = [UIColor murielText];
+    textField.tintColor = [UIColor murielListIcon];
     textField.adjustsFontForContentSizeCategory = YES;
     [self updateTextFieldFont];
     [textField addTarget:self action:@selector(hideTextFieldKeyboard) forControlEvents:UIControlEventEditingDidEndOnExit];
@@ -73,7 +74,7 @@ - (void)setupTrashButton
 {
     UIButton *trashButton = self.trashButton;
     [trashButton setTitle:nil forState:UIControlStateNormal];
-    trashButton.tintColor = [UIColor murielNeutral30];
+    trashButton.tintColor = [UIColor murielListIcon];
     [trashButton setImage:[Gridicon iconOfType:GridiconTypeTrash] forState:UIControlStateNormal];
     [trashButton addTarget:self action:@selector(trashButtonPressed) forControlEvents:UIControlEventTouchUpInside];
     trashButton.backgroundColor = [UIColor clearColor];
@@ -88,7 +89,7 @@ - (void)setupTextFieldDesignViews
     UIImage *image = [Gridicon iconOfType:GridiconTypePencil];
     UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
     imageView.translatesAutoresizingMaskIntoConstraints = NO;
-    imageView.tintColor = [UIColor murielNeutral30];
+    imageView.tintColor = [UIColor murielListIcon];
     imageView.contentMode = UIViewContentModeScaleAspectFit;
     _textFieldDesignIcon = imageView;
 
@@ -156,7 +157,11 @@ - (void)showTextFieldEditingState
 
         self.doneButton.alpha = 1.0;
         self.textFieldDesignIcon.hidden = YES;
-        self.textFieldDesignView.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.6];
+        if (@available(iOS 13, *)) {
+            self.textFieldDesignView.backgroundColor = [UIColor tertiarySystemBackgroundColor];
+        } else {
+            self.textFieldDesignView.backgroundColor = [UIColor murielNeutral0];
+        }
 
     } completion:nil];
 }
diff --git a/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m b/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m
index 105e56a117a1..b7c2c35ff7c8 100644
--- a/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m
+++ b/WordPress/Classes/ViewRelated/Menus/MenuItemAbstractView.m
@@ -109,7 +109,7 @@ - (void)setupIconView
     // width and height constraints are (less than or equal to) in case the view is hidden
     [iconView.widthAnchor constraintLessThanOrEqualToConstant:MenusDesignItemIconSize].active = YES;
     [iconView.heightAnchor constraintLessThanOrEqualToConstant:MenusDesignItemIconSize].active = YES;
-    iconView.tintColor = [UIColor murielNeutral30];
+    iconView.tintColor = [UIColor murielListIcon];
     _iconView = iconView;
 
     NSAssert(_stackView != nil, @"stackView is nil");
@@ -214,6 +214,7 @@ - (UIButton *)addAccessoryButtonIconViewWithImage:(UIImage *)image
     button.backgroundColor = [UIColor clearColor];
 
     [button setImage:image forState:UIControlStateNormal];
+    button.tintColor = [UIColor murielTextTertiary];
 
     CGFloat padding = 6.0;
     CGFloat width = MenusDesignItemIconSize + (padding * 2);
@@ -269,7 +270,7 @@ - (UIColor *)iconTintColor
     if (self.highlighted) {
         color = [UIColor whiteColor];
     } else  {
-        color = [UIColor murielNeutral30];
+        color = [UIColor murielListIcon];
     }
 
     return color;
diff --git a/WordPress/Classes/ViewRelated/Menus/MenusSelectionDetailView.m b/WordPress/Classes/ViewRelated/Menus/MenusSelectionDetailView.m
index d65563d64107..6adbddbe0b75 100644
--- a/WordPress/Classes/ViewRelated/Menus/MenusSelectionDetailView.m
+++ b/WordPress/Classes/ViewRelated/Menus/MenusSelectionDetailView.m
@@ -110,7 +110,7 @@ - (void)setupAccessoryView
     UIImageView *accessoryView = [[UIImageView alloc] init];
     accessoryView.contentMode = UIViewContentModeScaleAspectFit;
     accessoryView.image = [Gridicon iconOfType:GridiconTypeChevronDown];
-    accessoryView.tintColor = [UIColor murielNeutral10];
+    accessoryView.tintColor = [UIColor murielTextTertiary];
     [accessoryView.widthAnchor constraintEqualToConstant:24].active = YES;
     [accessoryView.heightAnchor constraintEqualToConstant:24].active = YES;
     _accessoryView = accessoryView;

From 0a40611cfc14647db04e955bbbe28cc2009a5efb Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Mon, 9 Sep 2019 10:03:11 +0100
Subject: [PATCH 31/47] Fix Icon color

---
 WordPress/Classes/ViewRelated/Menus/MenuItemView.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/Menus/MenuItemView.m b/WordPress/Classes/ViewRelated/Menus/MenuItemView.m
index b03a3132958a..8aa702d1d99d 100644
--- a/WordPress/Classes/ViewRelated/Menus/MenuItemView.m
+++ b/WordPress/Classes/ViewRelated/Menus/MenuItemView.m
@@ -97,7 +97,7 @@ - (void)setHighlighted:(BOOL)highlighted
 
         [self.cancelButton setTitleColor:[UIColor murielPrimary] forState:UIControlStateNormal];
         self.addButton.tintColor = [UIColor murielPrimary];
-        self.orderingButton.tintColor = [UIColor murielNeutral10];
+        self.orderingButton.tintColor = [UIColor murielTextTertiary];
     }
 }
 

From 71c6d131201d0aef1d17582b502dba669d1377eb Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Mon, 9 Sep 2019 15:40:10 +0100
Subject: [PATCH 32/47] Make new muriel color

---
 .../Colors and Styles/UIColor+MurielColors.swift       | 10 ++++++++++
 .../Colors and Styles/UIColor+MurielColorsObjC.swift   |  5 +++++
 .../ViewRelated/Menus/MenuDetailsViewController.m      |  6 +-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift
index 1f0c3d99c596..a238bf26132b 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
@@ -117,6 +117,16 @@ extension UIColor {
         return .white
     }
 
+    /// Tertiary background
+    static var tertiaryBackground: UIColor {
+        #if XCODE11
+            if #available(iOS 13, *) {
+                return .tertiarySystemBackground
+            }
+        #endif
+        return .neutral(.shade10)
+    }
+
     /// Default text color: high contrast
     static var text: UIColor {
         #if XCODE11
diff --git a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift
index b1b2a62b0180..4f91aedf2315 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColorsObjC.swift	
@@ -106,6 +106,11 @@
         return .basicBackground
     }
 
+    @available(swift, obsoleted: 1.0)
+    static func murielTertiaryBackground() -> UIColor {
+        return .tertiaryBackground
+    }
+
     @available(swift, obsoleted: 1.0)
     static func murielTextPlaceholder() -> UIColor {
         return .textPlaceholder
diff --git a/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m b/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m
index ebb56bb51b53..0a61bc23a471 100644
--- a/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/MenuDetailsViewController.m
@@ -157,11 +157,7 @@ - (void)showTextFieldEditingState
 
         self.doneButton.alpha = 1.0;
         self.textFieldDesignIcon.hidden = YES;
-        if (@available(iOS 13, *)) {
-            self.textFieldDesignView.backgroundColor = [UIColor tertiarySystemBackgroundColor];
-        } else {
-            self.textFieldDesignView.backgroundColor = [UIColor murielNeutral0];
-        }
+        self.textFieldDesignView.backgroundColor = [UIColor murielTertiaryBackground];
 
     } completion:nil];
 }

From ad641c39c224788d497765abad0f8da18beaa33a Mon Sep 17 00:00:00 2001
From: James Frost <james.frost@automattic.com>
Date: Thu, 12 Sep 2019 09:02:01 -0400
Subject: [PATCH 33/47] Adds a temporary work around for an iOS 11 bug where
 colors can't be loaded from an asset catalog.

---
 .../Colors and Styles/MurielPalette.swift     | 338 ++++++++++++++++++
 .../UIColor+MurielColors.swift                |  16 +-
 WordPress/WordPress.xcodeproj/project.pbxproj |  16 +-
 3 files changed, 366 insertions(+), 4 deletions(-)
 create mode 100644 WordPress/Classes/Extensions/Colors and Styles/MurielPalette.swift

diff --git a/WordPress/Classes/Extensions/Colors and Styles/MurielPalette.swift b/WordPress/Classes/Extensions/Colors and Styles/MurielPalette.swift
new file mode 100644
index 000000000000..2443b906fdb6
--- /dev/null
+++ b/WordPress/Classes/Extensions/Colors and Styles/MurielPalette.swift	
@@ -0,0 +1,338 @@
+/* Generated by Color Studio v2.1.0 */
+
+struct MurielPalette {
+    static func color(from key: String) -> UIColor? {
+        switch key {
+        case "White":
+            return UIColor(red: 255/255.0, green: 255/255.0, blue: 255/255.0, alpha: 1)
+        case "Black":
+            return UIColor(red: 0/255.0, green: 0/255.0, blue: 0/255.0, alpha: 1)
+
+        case "Gray0":
+            return UIColor(red: 246/255.0, green: 247/255.0, blue: 247/255.0, alpha: 1)
+        case "Gray5":
+            return UIColor(red: 220/255.0, green: 220/255.0, blue: 222/255.0, alpha: 1)
+        case "Gray10":
+            return UIColor(red: 195/255.0, green: 196/255.0, blue: 199/255.0, alpha: 1)
+        case "Gray20":
+            return UIColor(red: 167/255.0, green: 170/255.0, blue: 173/255.0, alpha: 1)
+        case "Gray30":
+            return UIColor(red: 142/255.0, green: 145/255.0, blue: 150/255.0, alpha: 1)
+        case "Gray40":
+            return UIColor(red: 120/255.0, green: 124/255.0, blue: 130/255.0, alpha: 1)
+        case "Gray50":
+            return UIColor(red: 100/255.0, green: 105/255.0, blue: 112/255.0, alpha: 1)
+        case "Gray60":
+            return UIColor(red: 80/255.0, green: 87/255.0, blue: 94/255.0, alpha: 1)
+        case "Gray70":
+            return UIColor(red: 60/255.0, green: 67/255.0, blue: 74/255.0, alpha: 1)
+        case "Gray80":
+            return UIColor(red: 44/255.0, green: 51/255.0, blue: 56/255.0, alpha: 1)
+        case "Gray90":
+            return UIColor(red: 29/255.0, green: 35/255.0, blue: 39/255.0, alpha: 1)
+        case "Gray100":
+            return UIColor(red: 16/255.0, green: 21/255.0, blue: 23/255.0, alpha: 1)
+        case "Gray":
+            return UIColor(red: 100/255.0, green: 105/255.0, blue: 112/255.0, alpha: 1)
+
+        case "Blue0":
+            return UIColor(red: 239/255.0, green: 243/255.0, blue: 247/255.0, alpha: 1)
+        case "Blue5":
+            return UIColor(red: 198/255.0, green: 222/255.0, blue: 246/255.0, alpha: 1)
+        case "Blue10":
+            return UIColor(red: 154/255.0, green: 198/255.0, blue: 240/255.0, alpha: 1)
+        case "Blue20":
+            return UIColor(red: 114/255.0, green: 174/255.0, blue: 230/255.0, alpha: 1)
+        case "Blue30":
+            return UIColor(red: 81/255.0, green: 152/255.0, blue: 217/255.0, alpha: 1)
+        case "Blue40":
+            return UIColor(red: 53/255.0, green: 130/255.0, blue: 196/255.0, alpha: 1)
+        case "Blue50":
+            return UIColor(red: 34/255.0, green: 113/255.0, blue: 177/255.0, alpha: 1)
+        case "Blue60":
+            return UIColor(red: 19/255.0, green: 94/255.0, blue: 150/255.0, alpha: 1)
+        case "Blue70":
+            return UIColor(red: 10/255.0, green: 75/255.0, blue: 120/255.0, alpha: 1)
+        case "Blue80":
+            return UIColor(red: 4/255.0, green: 57/255.0, blue: 89/255.0, alpha: 1)
+        case "Blue90":
+            return UIColor(red: 1/255.0, green: 38/255.0, blue: 58/255.0, alpha: 1)
+        case "Blue100":
+            return UIColor(red: 0/255.0, green: 19/255.0, blue: 28/255.0, alpha: 1)
+        case "Blue":
+            return UIColor(red: 34/255.0, green: 113/255.0, blue: 177/255.0, alpha: 1)
+
+        case "Purple0":
+            return UIColor(red: 242/255.0, green: 236/255.0, blue: 239/255.0, alpha: 1)
+        case "Purple5":
+            return UIColor(red: 240/255.0, green: 209/255.0, blue: 228/255.0, alpha: 1)
+        case "Purple10":
+            return UIColor(red: 227/255.0, green: 174/255.0, blue: 212/255.0, alpha: 1)
+        case "Purple20":
+            return UIColor(red: 212/255.0, green: 143/255.0, blue: 200/255.0, alpha: 1)
+        case "Purple30":
+            return UIColor(red: 196/255.0, green: 117/255.0, blue: 189/255.0, alpha: 1)
+        case "Purple40":
+            return UIColor(red: 179/255.0, green: 94/255.0, blue: 177/255.0, alpha: 1)
+        case "Purple50":
+            return UIColor(red: 152/255.0, green: 74/255.0, blue: 156/255.0, alpha: 1)
+        case "Purple60":
+            return UIColor(red: 124/255.0, green: 57/255.0, blue: 130/255.0, alpha: 1)
+        case "Purple70":
+            return UIColor(red: 102/255.0, green: 44/255.0, blue: 110/255.0, alpha: 1)
+        case "Purple80":
+            return UIColor(red: 77/255.0, green: 32/255.0, blue: 84/255.0, alpha: 1)
+        case "Purple90":
+            return UIColor(red: 53/255.0, green: 22/255.0, blue: 59/255.0, alpha: 1)
+        case "Purple100":
+            return UIColor(red: 30/255.0, green: 12/255.0, blue: 33/255.0, alpha: 1)
+        case "Purple":
+            return UIColor(red: 152/255.0, green: 74/255.0, blue: 156/255.0, alpha: 1)
+
+        case "Pink0":
+            return UIColor(red: 245/255.0, green: 236/255.0, blue: 239/255.0, alpha: 1)
+        case "Pink5":
+            return UIColor(red: 250/255.0, green: 204/255.0, blue: 220/255.0, alpha: 1)
+        case "Pink10":
+            return UIColor(red: 247/255.0, green: 166/255.0, blue: 194/255.0, alpha: 1)
+        case "Pink20":
+            return UIColor(red: 242/255.0, green: 131/255.0, blue: 170/255.0, alpha: 1)
+        case "Pink30":
+            return UIColor(red: 235/255.0, green: 101/255.0, blue: 148/255.0, alpha: 1)
+        case "Pink40":
+            return UIColor(red: 227/255.0, green: 76/255.0, blue: 132/255.0, alpha: 1)
+        case "Pink50":
+            return UIColor(red: 201/255.0, green: 53/255.0, blue: 110/255.0, alpha: 1)
+        case "Pink60":
+            return UIColor(red: 171/255.0, green: 35/255.0, blue: 90/255.0, alpha: 1)
+        case "Pink70":
+            return UIColor(red: 140/255.0, green: 23/255.0, blue: 73/255.0, alpha: 1)
+        case "Pink80":
+            return UIColor(red: 112/255.0, green: 15/255.0, blue: 59/255.0, alpha: 1)
+        case "Pink90":
+            return UIColor(red: 79/255.0, green: 9/255.0, blue: 42/255.0, alpha: 1)
+        case "Pink100":
+            return UIColor(red: 38/255.0, green: 4/255.0, blue: 21/255.0, alpha: 1)
+        case "Pink":
+            return UIColor(red: 201/255.0, green: 53/255.0, blue: 110/255.0, alpha: 1)
+
+        case "Red0":
+            return UIColor(red: 247/255.0, green: 237/255.0, blue: 238/255.0, alpha: 1)
+        case "Red5":
+            return UIColor(red: 255/255.0, green: 204/255.0, blue: 208/255.0, alpha: 1)
+        case "Red10":
+            return UIColor(red: 255/255.0, green: 166/255.0, blue: 171/255.0, alpha: 1)
+        case "Red20":
+            return UIColor(red: 255/255.0, green: 128/255.0, blue: 133/255.0, alpha: 1)
+        case "Red30":
+            return UIColor(red: 248/255.0, green: 99/255.0, blue: 104/255.0, alpha: 1)
+        case "Red40":
+            return UIColor(red: 230/255.0, green: 80/255.0, blue: 84/255.0, alpha: 1)
+        case "Red50":
+            return UIColor(red: 214/255.0, green: 54/255.0, blue: 56/255.0, alpha: 1)
+        case "Red60":
+            return UIColor(red: 179/255.0, green: 45/255.0, blue: 46/255.0, alpha: 1)
+        case "Red70":
+            return UIColor(red: 138/255.0, green: 36/255.0, blue: 36/255.0, alpha: 1)
+        case "Red80":
+            return UIColor(red: 105/255.0, green: 28/255.0, blue: 28/255.0, alpha: 1)
+        case "Red90":
+            return UIColor(red: 69/255.0, green: 19/255.0, blue: 19/255.0, alpha: 1)
+        case "Red100":
+            return UIColor(red: 36/255.0, green: 10/255.0, blue: 10/255.0, alpha: 1)
+        case "Red":
+            return UIColor(red: 214/255.0, green: 54/255.0, blue: 56/255.0, alpha: 1)
+
+        case "Orange0":
+            return UIColor(red: 247/255.0, green: 240/255.0, blue: 234/255.0, alpha: 1)
+        case "Orange5":
+            return UIColor(red: 252/255.0, green: 215/255.0, blue: 186/255.0, alpha: 1)
+        case "Orange10":
+            return UIColor(red: 255/255.0, green: 191/255.0, blue: 134/255.0, alpha: 1)
+        case "Orange20":
+            return UIColor(red: 250/255.0, green: 167/255.0, blue: 84/255.0, alpha: 1)
+        case "Orange30":
+            return UIColor(red: 230/255.0, green: 139/255.0, blue: 40/255.0, alpha: 1)
+        case "Orange40":
+            return UIColor(red: 214/255.0, green: 119/255.0, blue: 9/255.0, alpha: 1)
+        case "Orange50":
+            return UIColor(red: 178/255.0, green: 98/255.0, blue: 0/255.0, alpha: 1)
+        case "Orange60":
+            return UIColor(red: 138/255.0, green: 77/255.0, blue: 0/255.0, alpha: 1)
+        case "Orange70":
+            return UIColor(red: 112/255.0, green: 64/255.0, blue: 0/255.0, alpha: 1)
+        case "Orange80":
+            return UIColor(red: 84/255.0, green: 49/255.0, blue: 0/255.0, alpha: 1)
+        case "Orange90":
+            return UIColor(red: 54/255.0, green: 31/255.0, blue: 0/255.0, alpha: 1)
+        case "Orange100":
+            return UIColor(red: 31/255.0, green: 18/255.0, blue: 0/255.0, alpha: 1)
+        case "Orange":
+            return UIColor(red: 178/255.0, green: 98/255.0, blue: 0/255.0, alpha: 1)
+
+        case "Yellow0":
+            return UIColor(red: 247/255.0, green: 242/255.0, blue: 230/255.0, alpha: 1)
+        case "Yellow5":
+            return UIColor(red: 247/255.0, green: 225/255.0, blue: 174/255.0, alpha: 1)
+        case "Yellow10":
+            return UIColor(red: 242/255.0, green: 207/255.0, blue: 117/255.0, alpha: 1)
+        case "Yellow20":
+            return UIColor(red: 240/255.0, green: 196/255.0, blue: 67/255.0, alpha: 1)
+        case "Yellow30":
+            return UIColor(red: 219/255.0, green: 174/255.0, blue: 23/255.0, alpha: 1)
+        case "Yellow40":
+            return UIColor(red: 182/255.0, green: 144/255.0, blue: 0/255.0, alpha: 1)
+        case "Yellow50":
+            return UIColor(red: 144/255.0, green: 115/255.0, blue: 0/255.0, alpha: 1)
+        case "Yellow60":
+            return UIColor(red: 112/255.0, green: 91/255.0, blue: 0/255.0, alpha: 1)
+        case "Yellow70":
+            return UIColor(red: 92/255.0, green: 75/255.0, blue: 0/255.0, alpha: 1)
+        case "Yellow80":
+            return UIColor(red: 69/255.0, green: 57/255.0, blue: 0/255.0, alpha: 1)
+        case "Yellow90":
+            return UIColor(red: 48/255.0, green: 40/255.0, blue: 0/255.0, alpha: 1)
+        case "Yellow100":
+            return UIColor(red: 28/255.0, green: 23/255.0, blue: 0/255.0, alpha: 1)
+        case "Yellow":
+            return UIColor(red: 144/255.0, green: 115/255.0, blue: 0/255.0, alpha: 1)
+
+        case "Green0":
+            return UIColor(red: 235/255.0, green: 247/255.0, blue: 241/255.0, alpha: 1)
+        case "Green5":
+            return UIColor(red: 164/255.0, green: 245/255.0, blue: 200/255.0, alpha: 1)
+        case "Green10":
+            return UIColor(red: 89/255.0, green: 227/255.0, blue: 143/255.0, alpha: 1)
+        case "Green20":
+            return UIColor(red: 30/255.0, green: 209/255.0, blue: 90/255.0, alpha: 1)
+        case "Green30":
+            return UIColor(red: 0/255.0, green: 186/255.0, blue: 55/255.0, alpha: 1)
+        case "Green40":
+            return UIColor(red: 0/255.0, green: 163/255.0, blue: 42/255.0, alpha: 1)
+        case "Green50":
+            return UIColor(red: 0/255.0, green: 138/255.0, blue: 32/255.0, alpha: 1)
+        case "Green60":
+            return UIColor(red: 0/255.0, green: 112/255.0, blue: 23/255.0, alpha: 1)
+        case "Green70":
+            return UIColor(red: 0/255.0, green: 92/255.0, blue: 18/255.0, alpha: 1)
+        case "Green80":
+            return UIColor(red: 0/255.0, green: 69/255.0, blue: 12/255.0, alpha: 1)
+        case "Green90":
+            return UIColor(red: 0/255.0, green: 48/255.0, blue: 8/255.0, alpha: 1)
+        case "Green100":
+            return UIColor(red: 0/255.0, green: 28/255.0, blue: 5/255.0, alpha: 1)
+        case "Green":
+            return UIColor(red: 0/255.0, green: 138/255.0, blue: 32/255.0, alpha: 1)
+
+        case "Celadon0":
+            return UIColor(red: 236/255.0, green: 247/255.0, blue: 244/255.0, alpha: 1)
+        case "Celadon5":
+            return UIColor(red: 166/255.0, green: 235/255.0, blue: 214/255.0, alpha: 1)
+        case "Celadon10":
+            return UIColor(red: 99/255.0, green: 214/255.0, blue: 182/255.0, alpha: 1)
+        case "Celadon20":
+            return UIColor(red: 46/255.0, green: 189/255.0, blue: 153/255.0, alpha: 1)
+        case "Celadon30":
+            return UIColor(red: 9/255.0, green: 168/255.0, blue: 132/255.0, alpha: 1)
+        case "Celadon40":
+            return UIColor(red: 0/255.0, green: 145/255.0, blue: 114/255.0, alpha: 1)
+        case "Celadon50":
+            return UIColor(red: 0/255.0, green: 126/255.0, blue: 101/255.0, alpha: 1)
+        case "Celadon60":
+            return UIColor(red: 0/255.0, green: 103/255.0, blue: 83/255.0, alpha: 1)
+        case "Celadon70":
+            return UIColor(red: 0/255.0, green: 80/255.0, blue: 66/255.0, alpha: 1)
+        case "Celadon80":
+            return UIColor(red: 0/255.0, green: 59/255.0, blue: 48/255.0, alpha: 1)
+        case "Celadon90":
+            return UIColor(red: 0/255.0, green: 39/255.0, blue: 33/255.0, alpha: 1)
+        case "Celadon100":
+            return UIColor(red: 0/255.0, green: 28/255.0, blue: 23/255.0, alpha: 1)
+        case "Celadon":
+            return UIColor(red: 0/255.0, green: 126/255.0, blue: 101/255.0, alpha: 1)
+
+        case "WordPressBlue0":
+            return UIColor(red: 233/255.0, green: 243/255.0, blue: 247/255.0, alpha: 1)
+        case "WordPressBlue5":
+            return UIColor(red: 193/255.0, green: 225/255.0, blue: 238/255.0, alpha: 1)
+        case "WordPressBlue10":
+            return UIColor(red: 153/255.0, green: 205/255.0, blue: 225/255.0, alpha: 1)
+        case "WordPressBlue20":
+            return UIColor(red: 106/255.0, green: 179/255.0, blue: 208/255.0, alpha: 1)
+        case "WordPressBlue30":
+            return UIColor(red: 56/255.0, green: 149/255.0, blue: 186/255.0, alpha: 1)
+        case "WordPressBlue40":
+            return UIColor(red: 24/255.0, green: 122/255.0, blue: 162/255.0, alpha: 1)
+        case "WordPressBlue50":
+            return UIColor(red: 0/255.0, green: 96/255.0, blue: 136/255.0, alpha: 1)
+        case "WordPressBlue60":
+            return UIColor(red: 0/255.0, green: 78/255.0, blue: 110/255.0, alpha: 1)
+        case "WordPressBlue70":
+            return UIColor(red: 0/255.0, green: 60/255.0, blue: 86/255.0, alpha: 1)
+        case "WordPressBlue80":
+            return UIColor(red: 0/255.0, green: 44/255.0, blue: 64/255.0, alpha: 1)
+        case "WordPressBlue90":
+            return UIColor(red: 0/255.0, green: 29/255.0, blue: 45/255.0, alpha: 1)
+        case "WordPressBlue100":
+            return UIColor(red: 0/255.0, green: 16/255.0, blue: 28/255.0, alpha: 1)
+        case "WordPressBlue":
+            return UIColor(red: 0/255.0, green: 96/255.0, blue: 136/255.0, alpha: 1)
+
+        case "WooCommercePurple0":
+            return UIColor(red: 245/255.0, green: 233/255.0, blue: 245/255.0, alpha: 1)
+        case "WooCommercePurple5":
+            return UIColor(red: 236/255.0, green: 204/255.0, blue: 240/255.0, alpha: 1)
+        case "WooCommercePurple10":
+            return UIColor(red: 221/255.0, green: 176/255.0, blue: 235/255.0, alpha: 1)
+        case "WooCommercePurple20":
+            return UIColor(red: 199/255.0, green: 146/255.0, blue: 224/255.0, alpha: 1)
+        case "WooCommercePurple30":
+            return UIColor(red: 175/255.0, green: 125/255.0, blue: 209/255.0, alpha: 1)
+        case "WooCommercePurple40":
+            return UIColor(red: 154/255.0, green: 105/255.0, blue: 199/255.0, alpha: 1)
+        case "WooCommercePurple50":
+            return UIColor(red: 127/255.0, green: 84/255.0, blue: 179/255.0, alpha: 1)
+        case "WooCommercePurple60":
+            return UIColor(red: 103/255.0, green: 67/255.0, blue: 153/255.0, alpha: 1)
+        case "WooCommercePurple70":
+            return UIColor(red: 83/255.0, green: 53/255.0, blue: 130/255.0, alpha: 1)
+        case "WooCommercePurple80":
+            return UIColor(red: 60/255.0, green: 40/255.0, blue: 97/255.0, alpha: 1)
+        case "WooCommercePurple90":
+            return UIColor(red: 39/255.0, green: 27/255.0, blue: 61/255.0, alpha: 1)
+        case "WooCommercePurple100":
+            return UIColor(red: 20/255.0, green: 14/255.0, blue: 31/255.0, alpha: 1)
+        case "WooCommercePurple":
+            return UIColor(red: 127/255.0, green: 84/255.0, blue: 179/255.0, alpha: 1)
+
+        case "JetpackGreen0":
+            return UIColor(red: 242/255.0, green: 247/255.0, blue: 231/255.0, alpha: 1)
+        case "JetpackGreen5":
+            return UIColor(red: 208/255.0, green: 239/255.0, blue: 173/255.0, alpha: 1)
+        case "JetpackGreen10":
+            return UIColor(red: 157/255.0, green: 222/255.0, blue: 115/255.0, alpha: 1)
+        case "JetpackGreen20":
+            return UIColor(red: 100/255.0, green: 202/255.0, blue: 67/255.0, alpha: 1)
+        case "JetpackGreen30":
+            return UIColor(red: 47/255.0, green: 180/255.0, blue: 31/255.0, alpha: 1)
+        case "JetpackGreen40":
+            return UIColor(red: 6/255.0, green: 158/255.0, blue: 8/255.0, alpha: 1)
+        case "JetpackGreen50":
+            return UIColor(red: 0/255.0, green: 135/255.0, blue: 16/255.0, alpha: 1)
+        case "JetpackGreen60":
+            return UIColor(red: 0/255.0, green: 113/255.0, blue: 23/255.0, alpha: 1)
+        case "JetpackGreen70":
+            return UIColor(red: 0/255.0, green: 91/255.0, blue: 24/255.0, alpha: 1)
+        case "JetpackGreen80":
+            return UIColor(red: 0/255.0, green: 69/255.0, blue: 21/255.0, alpha: 1)
+        case "JetpackGreen90":
+            return UIColor(red: 0/255.0, green: 48/255.0, blue: 16/255.0, alpha: 1)
+        case "JetpackGreen100":
+            return UIColor(red: 0/255.0, green: 28/255.0, blue: 9/255.0, alpha: 1)
+        case "JetpackGreen":
+            return UIColor(red: 47/255.0, green: 180/255.0, blue: 31/255.0, alpha: 1)
+        default:
+            return nil
+        }
+    }
+}
diff --git a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift
index 8f989fcbd89a..596968defd14 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
@@ -6,10 +6,22 @@ extension UIColor {
     /// - Returns: UIColor. Red in cases of error
     class func muriel(color murielColor: MurielColor) -> UIColor {
         let assetName = murielColor.assetName()
-        guard let color = UIColor(named: assetName) else {
+        let color: UIColor?
+
+        // This is temporary work around as there's a bug in the
+        // GM seed of Xcode 11 which causes loading colors from asset
+        // catalogs to fail (54325712)
+        if #available(iOS 12.0, *) {
+            color = UIColor(named: assetName)
+        } else {
+            color = MurielPalette.color(from: assetName)
+        }
+
+        guard let unwrappedColor = color else {
             return .red
         }
-        return color
+
+        return unwrappedColor
     }
     /// Get a UIColor from the Muriel color palette, adjusted to a given shade
     /// - Parameter color: an instance of a MurielColor
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index 95f576f08474..865c90f47578 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -145,6 +145,11 @@
 		172D7825212D93B800D513F7 /* GiphyPageableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 172D7824212D93B800D513F7 /* GiphyPageableTests.swift */; };
 		172E27D31FD98135003EA321 /* NoticePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 172E27D21FD98135003EA321 /* NoticePresenter.swift */; };
 		1730D4A31E97E3E400326B7C /* MediaItemTableViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1730D4A21E97E3E400326B7C /* MediaItemTableViewCells.swift */; };
+		1739605D2327FC0F00D4837B /* MurielPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1739605C2327FC0F00D4837B /* MurielPalette.swift */; };
+		1739605E2327FC6E00D4837B /* MurielPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1739605C2327FC0F00D4837B /* MurielPalette.swift */; };
+		1739605F2327FC6F00D4837B /* MurielPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1739605C2327FC0F00D4837B /* MurielPalette.swift */; };
+		173960602327FC6F00D4837B /* MurielPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1739605C2327FC0F00D4837B /* MurielPalette.swift */; };
+		173960612327FC7100D4837B /* MurielPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1739605C2327FC0F00D4837B /* MurielPalette.swift */; };
 		173BCE731CEB368A00AE8817 /* DomainsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173BCE721CEB368A00AE8817 /* DomainsListViewController.swift */; };
 		173BCE751CEB369900AE8817 /* Domains.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 173BCE741CEB369900AE8817 /* Domains.storyboard */; };
 		173BCE791CEB780800AE8817 /* Domain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173BCE781CEB780800AE8817 /* Domain.swift */; };
@@ -2199,6 +2204,7 @@
 		172D7824212D93B800D513F7 /* GiphyPageableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiphyPageableTests.swift; sourceTree = "<group>"; };
 		172E27D21FD98135003EA321 /* NoticePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticePresenter.swift; sourceTree = "<group>"; };
 		1730D4A21E97E3E400326B7C /* MediaItemTableViewCells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaItemTableViewCells.swift; sourceTree = "<group>"; };
+		1739605C2327FC0F00D4837B /* MurielPalette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MurielPalette.swift; sourceTree = "<group>"; };
 		173BCE721CEB368A00AE8817 /* DomainsListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DomainsListViewController.swift; sourceTree = "<group>"; };
 		173BCE741CEB369900AE8817 /* Domains.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Domains.storyboard; sourceTree = "<group>"; };
 		173BCE781CEB780800AE8817 /* Domain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Domain.swift; sourceTree = "<group>"; };
@@ -4965,7 +4971,7 @@
 			path = Networking;
 			sourceTree = "<group>";
 		};
-		29B97314FDCFA39411CA2CEA = {
+		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
 				F14B5F6F208E648200439554 /* config */,
@@ -5385,6 +5391,7 @@
 			children = (
 				4326191422FCB9DC003C7642 /* MurielColor.swift */,
 				435B762122973D0600511813 /* UIColor+MurielColors.swift */,
+				1739605C2327FC0F00D4837B /* MurielPalette.swift */,
 				436110DF22C4241A000773AD /* UIColor+MurielColorsObjC.swift */,
 				E678FC141C76241000F55F55 /* WPStyleGuide+ApplicationStyles.swift */,
 				17D975AE1EF7F6F100303D63 /* WPStyleGuide+Aztec.swift */,
@@ -9555,7 +9562,7 @@
 				bg,
 				sk,
 			);
-			mainGroup = 29B97314FDCFA39411CA2CEA;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -11455,6 +11462,7 @@
 				08D345501CD7F50900358E8C /* MenusSelectionDetailView.m in Sources */,
 				591AA5021CEF9BF20074934F /* Post+CoreDataProperties.swift in Sources */,
 				E19B17AE1E5C6944007517C6 /* BasePost.swift in Sources */,
+				1739605D2327FC0F00D4837B /* MurielPalette.swift in Sources */,
 				7E7947A9210BAC1D005BB851 /* NotificationContentRange.swift in Sources */,
 				E1EBC36F1C118EA500F638E0 /* ImmuTable.swift in Sources */,
 				B59B18751CC7FB8D0055EB7C /* PersonViewController.swift in Sources */,
@@ -11508,6 +11516,7 @@
 				436110DE22C41B02000773AD /* BuildConfiguration.swift in Sources */,
 				73F6DD44212C714F00CE447D /* RichNotificationViewModel.swift in Sources */,
 				736584E6213752730029C9A4 /* SFHFKeychainUtils.m in Sources */,
+				173960612327FC7100D4837B /* MurielPalette.swift in Sources */,
 				73B05D2621374B960073ECAA /* Tracks.swift in Sources */,
 				736584EC2137533A0029C9A4 /* Tracks+ContentExtension.swift in Sources */,
 			);
@@ -11591,6 +11600,7 @@
 				74021A01202E12F4006CC39F /* SharedCoreDataStack.swift in Sources */,
 				74021A14202E1393006CC39F /* ShareExtensionEditorViewController.swift in Sources */,
 				CE39E17320CB117B00CABA05 /* RemoteBlog+Capabilities.swift in Sources */,
+				1739605F2327FC6F00D4837B /* MurielPalette.swift in Sources */,
 				74021A0F202E1370006CC39F /* ExtensionTransitioningManager.swift in Sources */,
 				74E44AD92031ED2300556205 /* WordPressDraft-Lumberjack.m in Sources */,
 				741AF3A5202F3E2A00C771A5 /* Tracks+DraftAction.swift in Sources */,
@@ -11668,6 +11678,7 @@
 				74448F542044BC7600BD4CDA /* CategoryTree.swift in Sources */,
 				74402F2A200528F200A1D4A2 /* ExtensionPresentationController.swift in Sources */,
 				B5BEA55F1C7CE6D100C8035B /* Constants.m in Sources */,
+				1739605E2327FC6E00D4837B /* MurielPalette.swift in Sources */,
 				CE39E17220CB117B00CABA05 /* RemoteBlog+Capabilities.swift in Sources */,
 				BE6787F51FFF2886005D9F01 /* ShareModularViewController.swift in Sources */,
 				B5552D7E1CD101A600B26DF6 /* NSExtensionContext+Extensions.swift in Sources */,
@@ -11701,6 +11712,7 @@
 				433ADC1C223B2A7E00ED9DE1 /* TextBundleWrapper.m in Sources */,
 				93E5284119A7741A003A1A9C /* TodayViewController.swift in Sources */,
 				938CF3DE1EF1BE8000AF838E /* CocoaLumberjack.swift in Sources */,
+				173960602327FC6F00D4837B /* MurielPalette.swift in Sources */,
 				93C2075A1CC7FF9C00C94D04 /* Tracks.swift in Sources */,
 				436110DA22C3ED44000773AD /* FeatureFlag.swift in Sources */,
 				436110DB22C3ED4C000773AD /* BuildConfiguration.swift in Sources */,

From 0ab6811d5d04a22325d3cf5766e08262e65ef137 Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Fri, 13 Sep 2019 12:21:03 -0400
Subject: [PATCH 34/47] Fix colors in Domain redemption flow

---
 .../WPStyleGuide+ApplicationStyles.swift      |  2 +-
 ...reditRedemptionSuccessViewController.swift |  2 +-
 .../Cells/InlineEditableNameValueCell.swift   |  5 +++--
 .../RegisterDomainDetailsViewController.swift |  3 ++-
 .../RegisterDomainDetailsFooterView.swift     |  1 +
 ...isterDomainSuggestionsViewController.swift |  1 +
 ...DomainSuggestionsTableViewController.swift | 20 ++++++++++++++++++-
 .../Views/NoResultsViewController.swift       |  3 ++-
 8 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift
index 76bf004c0285..c1e06290e760 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift	
@@ -110,7 +110,7 @@ extension WPStyleGuide {
     @objc
     class func configureTableViewActionCell(_ cell: UITableViewCell?) {
         configureTableViewCell(cell)
-        cell?.textLabel?.textColor = .primary
+        cell?.textLabel?.textColor = .text
     }
 
     @objc
diff --git a/WordPress/Classes/ViewRelated/Blog/DomainCredit/DomainCreditRedemptionSuccessViewController.swift b/WordPress/Classes/ViewRelated/Blog/DomainCredit/DomainCreditRedemptionSuccessViewController.swift
index ff9a5fc2f742..9b5713c4d864 100644
--- a/WordPress/Classes/ViewRelated/Blog/DomainCredit/DomainCreditRedemptionSuccessViewController.swift
+++ b/WordPress/Classes/ViewRelated/Blog/DomainCredit/DomainCreditRedemptionSuccessViewController.swift
@@ -47,7 +47,7 @@ class DomainCreditRedemptionSuccessViewController: UIViewController {
             return nil
         }
         let font = WPStyleGuide.fontForTextStyle(.body, fontWeight: .semibold)
-        newAttributedString.setAttributes([.font: font, .foregroundColor: UIColor.neutral(.shade70)],
+        newAttributedString.setAttributes([.font: font, .foregroundColor: UIColor.text],
                                           range: range)
         return newAttributedString
     }
diff --git a/WordPress/Classes/ViewRelated/Cells/InlineEditableNameValueCell.swift b/WordPress/Classes/ViewRelated/Cells/InlineEditableNameValueCell.swift
index d47a157e0175..3c5d666af72a 100644
--- a/WordPress/Classes/ViewRelated/Cells/InlineEditableNameValueCell.swift
+++ b/WordPress/Classes/ViewRelated/Cells/InlineEditableNameValueCell.swift
@@ -12,8 +12,8 @@ class InlineEditableNameValueCell: WPTableViewCell, NibReusable {
 
     enum Const {
         enum Color {
-            static let nameText = UIColor.neutral(.shade70)
-            static let valueText = UIColor.neutral(.shade40)
+            static let nameText = UIColor.text
+            static let valueText = UIColor.textSubtle
         }
     }
 
@@ -39,6 +39,7 @@ class InlineEditableNameValueCell: WPTableViewCell, NibReusable {
         nameLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(setValueTextFieldAsFirstResponder(_:))))
 
         valueTextField.textColor = Const.Color.valueText
+        valueTextField.tintColor = .textPlaceholder
         valueTextField.font = WPStyleGuide.tableviewTextFont()
         valueTextField.borderStyle = .none
         valueTextField.addTarget(self,
diff --git a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift
index 51a3db55a88a..2305ad5d6a75 100644
--- a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift
+++ b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController.swift
@@ -280,7 +280,7 @@ extension RegisterDomainDetailsViewController {
             let attributedItem = NSAttributedString.init(
                 string: item,
                 attributes: [.font: WPStyleGuide.tableviewTextFont(),
-                             .foregroundColor: UIColor.neutral(.shade70)]
+                             .foregroundColor: UIColor.text]
             )
             let option = OptionsTableViewOption(
                 image: nil,
@@ -289,6 +289,7 @@ extension RegisterDomainDetailsViewController {
             options.append(option)
         }
         let viewController = OptionsTableViewController(options: options)
+        viewController.cellBackgroundColor = .listForeground
         if let selectedIndex = selectedItemIndex[indexPath] {
             viewController.selectRow(at: selectedIndex)
         }
diff --git a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/Views/RegisterDomainDetailsFooterView.swift b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/Views/RegisterDomainDetailsFooterView.swift
index 3e7f7ab29def..e42dabf0faf9 100644
--- a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/Views/RegisterDomainDetailsFooterView.swift
+++ b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/Views/RegisterDomainDetailsFooterView.swift
@@ -9,5 +9,6 @@ class RegisterDomainDetailsFooterView: UIView, NibLoadable {
         super.awakeFromNib()
         clipsToBounds = false
         submitButton.isPrimary = true
+        backgroundColor = .basicBackground
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift
index ea3bcfec9342..a0c6aa804c1c 100644
--- a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift
+++ b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainSuggestions/RegisterDomainSuggestionsViewController.swift
@@ -31,6 +31,7 @@ class RegisterDomainSuggestionsViewController: NUXViewController, DomainSuggesti
 
     private lazy var buttonViewController: NUXButtonViewController = {
         let buttonViewController = NUXButtonViewController.instance()
+        buttonViewController.view.backgroundColor = .basicBackground
         buttonViewController.delegate = self
         buttonViewController.setButtonTitles(
             primary: NSLocalizedString("Choose domain",
diff --git a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
index 7ca0bca42f3d..ac5eefee961b 100644
--- a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
@@ -96,6 +96,18 @@ class DomainSuggestionsTableViewController: NUXTableViewController {
         SVProgressHUD.dismiss()
     }
 
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
+        #if XCODE11
+            if #available(iOS 13, *) {
+                if traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle {
+                    tableView.reloadData()
+                }
+            }
+        #endif
+    }
+
     /// Fetches new domain suggestions based on the provided string
     ///
     /// - Parameters:
@@ -253,10 +265,10 @@ extension DomainSuggestionsTableViewController {
         }
 
         cell.placeholder = searchFieldPlaceholder
+        cell.reloadTextFieldIcon()
         cell.delegate = self
         cell.selectionStyle = .none
         cell.backgroundColor = .clear
-
         return cell
     }
 
@@ -378,3 +390,9 @@ extension DomainSuggestionsTableViewController: SearchTableViewCellDelegate {
         }
     }
 }
+
+extension SearchTableViewCell {
+    fileprivate func reloadTextFieldIcon() {
+        textField.leftViewImage = UIImage(named: "icon-post-search")
+    }
+}
diff --git a/WordPress/Classes/ViewRelated/Views/NoResultsViewController.swift b/WordPress/Classes/ViewRelated/Views/NoResultsViewController.swift
index bbbd617456d1..877d4643039a 100644
--- a/WordPress/Classes/ViewRelated/Views/NoResultsViewController.swift
+++ b/WordPress/Classes/ViewRelated/Views/NoResultsViewController.swift
@@ -277,11 +277,12 @@ private extension NoResultsViewController {
         titleLabel.text = titleText
         titleLabel.textColor = .text
 
+        subtitleTextView.textColor = .textSubtle
+
         if let subtitleText = subtitleText {
             subtitleTextView.attributedText = nil
             subtitleTextView.text = subtitleText
             subtitleTextView.isSelectable = false
-            subtitleTextView.textColor = .textSubtle
         }
 
         if let attributedSubtitleText = attributedSubtitleText {

From f339571aff6e7cb393d663bd134bdb95178898ac Mon Sep 17 00:00:00 2001
From: James Frost <james.frost@automattic.com>
Date: Sat, 14 Sep 2019 12:26:10 -0400
Subject: [PATCH 35/47] Remove broken site segment cell test

---
 .../WordPressTest/SiteCreation/SiteSegmentsCellTests.swift    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/WordPress/WordPressTest/SiteCreation/SiteSegmentsCellTests.swift b/WordPress/WordPressTest/SiteCreation/SiteSegmentsCellTests.swift
index 31b8dd1e4d74..e48f67f69889 100644
--- a/WordPress/WordPressTest/SiteCreation/SiteSegmentsCellTests.swift
+++ b/WordPress/WordPressTest/SiteCreation/SiteSegmentsCellTests.swift
@@ -44,10 +44,6 @@ final class SiteSegmentsCellTests: XCTestCase {
         XCTAssertEqual(cell?.subtitle.text, MockValues.subtitle)
     }
 
-    func testBackgroundIsStyled() {
-        XCTAssertEqual(cell?.backgroundColor, UIColor.white)
-    }
-
     func testCellTitleIsTheCorrectFont() {
         XCTAssertEqual(cell?.title.font, WPStyleGuide.fontForTextStyle(.body, fontWeight: .semibold))
     }

From 02c7ccc178ae69ad3709f434f80dfaa62a18670a Mon Sep 17 00:00:00 2001
From: Daniele Bogo <daniele.bogo@automattic.com>
Date: Sat, 14 Sep 2019 14:37:30 -0400
Subject: [PATCH 36/47] Fix labels colors

---
 .../RegisterDomainDetailsViewController+HeaderFooter.swift | 7 ++++---
 .../Domains/Views/RegisterDomainSectionHeaderView.swift    | 6 +++---
 .../NUX/DomainSuggestionsTableViewController.swift         | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController+HeaderFooter.swift b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController+HeaderFooter.swift
index 6db741f748ba..e46d1907bd7a 100644
--- a/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController+HeaderFooter.swift
+++ b/WordPress/Classes/ViewRelated/Domains/Register/RegisterDomainDetails/ViewController/RegisterDomainDetailsViewController+HeaderFooter.swift
@@ -57,10 +57,11 @@ extension RegisterDomainDetailsViewController {
                 return nil
         }
         view.titleLabel?.attributedText = termsAndConditionsFooterTitle
+        view.titleLabel?.textColor = .textSubtle
         view.titleLabel?.numberOfLines = 0
         view.titleLabel?.lineBreakMode = .byWordWrapping
         view.topConstraint.constant = Constant.privacyProtectionSectionTitleTopDistance
-        view.contentView.backgroundColor = .neutral(.shade5)
+        view.contentView.backgroundColor = .listBackground
         let tap = UITapGestureRecognizer(target: self, action: #selector(handleTermsAndConditionsTap(_:)))
         view.addGestureRecognizer(tap)
         return view
@@ -77,8 +78,8 @@ extension RegisterDomainDetailsViewController {
     }
 
     var termsAndConditionsFooterTitle: NSAttributedString {
-        let bodyColor = UIColor.neutral(.shade50)
-        let linkColor = UIColor.neutral(.shade70)
+        let bodyColor = UIColor.textSubtle
+        let linkColor = UIColor.textSubtle
         let font = UIFont.preferredFont(forTextStyle: .footnote)
 
         let attributes: StyledHTMLAttributes = [
diff --git a/WordPress/Classes/ViewRelated/Domains/Views/RegisterDomainSectionHeaderView.swift b/WordPress/Classes/ViewRelated/Domains/Views/RegisterDomainSectionHeaderView.swift
index 33b16da5a189..00d4e8ab3124 100644
--- a/WordPress/Classes/ViewRelated/Domains/Views/RegisterDomainSectionHeaderView.swift
+++ b/WordPress/Classes/ViewRelated/Domains/Views/RegisterDomainSectionHeaderView.swift
@@ -10,13 +10,13 @@ class RegisterDomainSectionHeaderView: UITableViewHeaderFooterView {
         super.awakeFromNib()
         titleLabel.font = WPStyleGuide.fontForTextStyle(.subheadline,
                                                         fontWeight: .semibold)
-        titleLabel.textColor = .neutral(.shade70)
+        titleLabel.textColor = .textSubtle
         titleLabel.numberOfLines = 0
 
         descriptionLabel.font = WPStyleGuide.fontForTextStyle(.footnote)
-        descriptionLabel.textColor = .neutral(.shade70)
+        descriptionLabel.textColor = .textSubtle
         descriptionLabel.numberOfLines = 0
-        contentView.backgroundColor = .neutral(.shade5)
+        contentView.backgroundColor = .listBackground
     }
 
     func setTitle(_ title: String?) {
diff --git a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
index ac5eefee961b..ebe2c1ed8d7d 100644
--- a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
@@ -265,7 +265,7 @@ extension DomainSuggestionsTableViewController {
         }
 
         cell.placeholder = searchFieldPlaceholder
-        cell.reloadTextFieldIcon()
+        cell.reloadTextfieldStyle()
         cell.delegate = self
         cell.selectionStyle = .none
         cell.backgroundColor = .clear
@@ -392,7 +392,8 @@ extension DomainSuggestionsTableViewController: SearchTableViewCellDelegate {
 }
 
 extension SearchTableViewCell {
-    fileprivate func reloadTextFieldIcon() {
+    fileprivate func reloadTextfieldStyle() {
+        textField.textColor = .text
         textField.leftViewImage = UIImage(named: "icon-post-search")
     }
 }

From cf7e796b84d8898a452d1a587efa8e5f62580a35 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@automattic.com>
Date: Sat, 14 Sep 2019 15:02:31 -0400
Subject: [PATCH 37/47] Update CircleCI for Xcode 11 (#12503)

---
 .circleci/config.yml | 46 ++++++++++++++++++++++++++++++--------------
 .ruby-version        |  2 +-
 Gemfile.lock         |  2 +-
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2f56e4827381..fb044d4b7891 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,15 +1,37 @@
 version: 2.1
 
 orbs:
-  ios: wordpress-mobile/ios@0.0.29
+  ios: wordpress-mobile/ios@0.0.31
+
+commands:
+  load-chruby:
+    steps:
+      - run:
+          name: Load chruby
+          command: |
+            # Force chruby to load to work around CircleCI Xcode 11 image issue
+            echo 'source /usr/local/opt/chruby/share/chruby/chruby.sh && chruby 2.5.5' >> $BASH_ENV
 
 jobs:
+  unit-tests:
+    executor:
+      name: ios/default
+      xcode-version: "11.0.0"
+    steps:
+      - checkout
+      - load-chruby
+      - ios/test:
+          xcode-version: "11.0.0"
+          workspace: WordPress.xcworkspace
+          scheme: WordPress
+          device: iPhone 11 
   build-ui-tests:
     executor:
       name: ios/default
-      xcode-version: "10.2.0"
+      xcode-version: "11.0.0"
     steps:
       - checkout
+      - load-chruby
       - ios/install-dependencies:
           bundle-install: true
           pod-install: true
@@ -27,10 +49,10 @@ jobs:
         type: string
     executor:
       name: ios/default
-      xcode-version: "10.2.0"
+      xcode-version: "11.0.0"
     steps:
       - ios/boot-simulator:
-          xcode-version: "10.2.0"
+          xcode-version: "11.0.0"
           device: << parameters.device >>
       - attach_workspace:
           at: ./
@@ -41,27 +63,23 @@ jobs:
       - ios/wait-for-simulator
       - ios/xcodebuild:
           command: test-without-building
-          arguments: -xctestrun DerivedData/Build/Products/WordPressUITests_iphonesimulator12.2-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID"
+          arguments: -xctestrun DerivedData/Build/Products/WordPressUITests_iphonesimulator13.0-x86_64.xctestrun -destination "platform=iOS Simulator,id=$SIMULATOR_UDID"
       - ios/save-xcodebuild-artifacts
 
 workflows:
   wordpress_ios:
     jobs:
-      - ios/test:
+      - unit-tests:
           name: build_and_test
-          xcode-version: "10.2.0"
-          workspace: WordPress.xcworkspace
-          scheme: WordPress
-          device: iPhone XS
   ui_tests:
     jobs:
       - build-ui-tests:
           name: Build UI Tests
       - run-ui-tests:
-          name: UI Tests (iPhone Xs)
-          device: iPhone Xs
+          name: UI Tests (iPhone 11)
+          device: iPhone 11
           requires: [ "Build UI Tests" ]
       - run-ui-tests:
-          name: UI Tests (iPad 6th generation)
-          device: iPad \\(6th generation\\)
+          name: UI Tests (iPad Air 6th generation)
+          device: iPad Air \\(3rd generation\\)
           requires: [ "Build UI Tests" ]
diff --git a/.ruby-version b/.ruby-version
index 276cbf9e2858..0cadbc1e33b2 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.0
+2.5.5
diff --git a/Gemfile.lock b/Gemfile.lock
index 715e061d3443..21f02ec60b00 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,4 +266,4 @@ DEPENDENCIES
   xcpretty-travis-formatter!
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

From e7c3702eb0386b83b4644f500dc3c8cf6b3b0159 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Fri, 13 Sep 2019 11:33:39 -0400
Subject: [PATCH 38/47] Re-enable ZenDesk

---
 Podfile                                       |  2 +-
 Podfile.lock                                  | 13 ++-
 WordPress/Classes/Utility/ZendeskUtils.swift  | 85 -------------------
 WordPress/WordPress.xcodeproj/project.pbxproj |  8 +-
 4 files changed, 14 insertions(+), 94 deletions(-)

diff --git a/Podfile b/Podfile
index 5db05b8b25cc..c804b4f1679a 100644
--- a/Podfile
+++ b/Podfile
@@ -155,7 +155,7 @@ target 'WordPress' do
     pod 'MRProgress', '0.8.3'
     pod 'Starscream', '3.0.6'
     pod 'SVProgressHUD', '2.2.5'
-    pod 'ZendeskSDK', '3.0.1'
+    pod 'ZendeskSDK', :git => 'https://github.com/zendesk/zendesk_sdk_ios', :tag => '3.0.1-swift5.1-GM'
     pod 'AlamofireNetworkActivityIndicator', '~> 2.3'
     pod 'FSInteractiveMap', :git => 'https://github.com/wordpress-mobile/FSInteractiveMap.git', :tag => '0.1.1'
 
diff --git a/Podfile.lock b/Podfile.lock
index a57225336c7b..23d34353140e 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -308,7 +308,7 @@ DEPENDENCIES:
   - WordPressUI (~> 1.3.5)
   - WPMediaPicker (~> 1.4.2)
   - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.11.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`)
-  - ZendeskSDK (= 3.0.1)
+  - ZendeskSDK (from `https://github.com/zendesk/zendesk_sdk_ios`, tag `3.0.1-swift5.1-GM`)
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
@@ -352,7 +352,6 @@ SPEC REPOS:
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
-    - ZendeskSDK
     - ZIPFoundation
 
 EXTERNAL SOURCES:
@@ -415,6 +414,9 @@ EXTERNAL SOURCES:
     :tag: v1.11.0
   yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.11.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json
+  ZendeskSDK:
+    :git: https://github.com/zendesk/zendesk_sdk_ios
+    :tag: 3.0.1-swift5.1-GM
 
 CHECKOUT OPTIONS:
   FSInteractiveMap:
@@ -426,6 +428,9 @@ CHECKOUT OPTIONS:
   RNTAztecView:
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
     :tag: v1.11.0
+  ZendeskSDK:
+    :git: https://github.com/zendesk/zendesk_sdk_ios
+    :tag: 3.0.1-swift5.1-GM
 
 SPEC CHECKSUMS:
   1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
@@ -495,9 +500,9 @@ SPEC CHECKSUMS:
   WPMediaPicker: 1897f312c7b41114ffd239fb782431ae602134a1
   wpxmlrpc: 6ba55c773cfa27083ae4a2173e69b19f46da98e2
   yoga: 4e71c9a33abf45ba55af55ae9cbc86f4234bb2a9
-  ZendeskSDK: c2e49fd16a73e43e490f777cea67dd852b819ace
+  ZendeskSDK: ce880e75f12ae5dacaa3658f49e545f3c8471030
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: eb2662b2d1884c3526e73b23c2e5a9304da88f1d
+PODFILE CHECKSUM: 5b13fe8dfd51d742f27e91fbc2cf2ecb41643867
 
 COCOAPODS: 1.6.1
diff --git a/WordPress/Classes/Utility/ZendeskUtils.swift b/WordPress/Classes/Utility/ZendeskUtils.swift
index 3bf86d28ae78..fd7f4811d4b0 100644
--- a/WordPress/Classes/Utility/ZendeskUtils.swift
+++ b/WordPress/Classes/Utility/ZendeskUtils.swift
@@ -2,10 +2,8 @@ import Foundation
 import CoreTelephony
 import WordPressAuthenticator
 
-#if !XCODE11
 import ZendeskSDK
 import ZendeskCoreSDK
-#endif
 
 extension NSNotification.Name {
     static let ZendeskPushNotificationReceivedNotification = NSNotification.Name(rawValue: "ZendeskPushNotificationReceivedNotification")
@@ -17,8 +15,6 @@ extension NSNotification.Name {
     public static let ZendeskPushNotificationClearedNotification = NSNotification.Name.ZendeskPushNotificationClearedNotification
 }
 
-#if !XCODE11
-
 /// This class provides the functionality to communicate with Zendesk for Help Center and support ticket interaction,
 /// as well as displaying views for the Help Center, new tickets, and ticket list.
 ///
@@ -979,84 +975,3 @@ extension ZendeskUtils: UITextFieldDelegate {
     }
 
 }
-
-
-
-#else
-
-/// This class provides the functionality to communicate with Zendesk for Help Center and support ticket interaction,
-/// as well as displaying views for the Help Center, new tickets, and ticket list.
-///
-@objc class ZendeskUtils: NSObject {
-
-    // MARK: - Public Properties
-
-    static var sharedInstance: ZendeskUtils = ZendeskUtils()
-    static var zendeskEnabled = false
-    @objc static var unreadNotificationsCount = 0
-
-    @objc static var showSupportNotificationIndicator: Bool {
-        return false
-    }
-
-    struct PushNotificationIdentifiers {
-        static let key = "type"
-        static let type = "zendesk"
-    }
-
-    // MARK: - Private Properties
-
-    private override init() {}
-    private var sourceTag: WordPressSupportSourceTag?
-
-    private var userName: String?
-    private var userEmail: String?
-    private var deviceID: String?
-    private var haveUserIdentity = false
-    private var alertNameField: UITextField?
-    private var sitePlansCache = [Int: RemotePlanSimpleDescription]()
-
-    private static var zdAppID: String?
-    private static var zdUrl: String?
-    private static var zdClientId: String?
-    private static var presentInController: UIViewController?
-
-    private static var appVersion: String {
-        return Bundle.main.shortVersionString() ?? ""
-    }
-
-    private static var appLanguage: String {
-        return Locale.preferredLanguages[0]
-    }
-
-    // MARK: - Public Methods
-
-    @objc static func setup() {}
-
-    // MARK: - Show Zendesk Views
-
-    func showHelpCenterIfPossible(from controller: UIViewController, with sourceTag: WordPressSupportSourceTag? = nil) {}
-    func showNewRequestIfPossible(from controller: UIViewController, with sourceTag: WordPressSupportSourceTag? = nil) {}
-    func showTicketListIfPossible(from controller: UIViewController, with sourceTag: WordPressSupportSourceTag? = nil) {}
-    func showSupportEmailPrompt(from controller: UIViewController, completion: @escaping (Bool) -> Void) {}
-
-    func cacheUnlocalizedSitePlans() {}
-
-    // MARK: - Device Registration
-    static func setNeedToRegisterDevice(_ identifier: String) {}
-    static func unregisterDevice() {}
-
-    // MARK: - Push Notifications
-
-    static func handlePushNotification(_ userInfo: NSDictionary) {}
-    static func pushNotificationReceived() {}
-    static func pushNotificationRead() {}
-
-    // MARK: - Helpers
-
-    static func userSupportEmail() -> String? {
-        return nil
-    }
-}
-
-#endif
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index 865c90f47578..5c836d47b5dd 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -10029,10 +10029,10 @@
 				"${BUILT_PRODUCTS_DIR}/WordPressKit/WordPressKit.framework",
 				"${BUILT_PRODUCTS_DIR}/WordPressShared/WordPressShared.framework",
 				"${BUILT_PRODUCTS_DIR}/WordPressUI/WordPressUI.framework",
-				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.0.1/ZendeskCoreSDK.framework",
-				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.0.1/ZendeskProviderSDK.framework",
-				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.0.1/ZendeskSDK.framework",
-				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.0.1/CommonUISDK.framework",
+				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.1.0/ZendeskCoreSDK.framework",
+				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.1.0/ZendeskProviderSDK.framework",
+				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.1.0/ZendeskSDK.framework",
+				"${PODS_ROOT}/ZendeskSDK/ZendeskSDK/5.1.0/CommonUISDK.framework",
 				"${BUILT_PRODUCTS_DIR}/wpxmlrpc/wpxmlrpc.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";

From 714ec861043eb51aff70ab1015c26928860590f3 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sat, 14 Sep 2019 16:22:52 -0400
Subject: [PATCH 39/47] Fix iOS 13 Safari issue

---
 WordPress/WordPressUITests/Screens/BaseScreen.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WordPress/WordPressUITests/Screens/BaseScreen.swift b/WordPress/WordPressUITests/Screens/BaseScreen.swift
index 59e05429f0fa..8e9d191171a4 100644
--- a/WordPress/WordPressUITests/Screens/BaseScreen.swift
+++ b/WordPress/WordPressUITests/Screens/BaseScreen.swift
@@ -53,7 +53,7 @@ class BaseScreen {
             safari.launch()
 
             // Select the URL bar when Safari opens
-            let urlBar = safari.otherElements["URL"]
+            let urlBar = safari.textFields.firstMatch
             waitFor(element: urlBar, predicate: "exists == true")
             urlBar.tap()
 
@@ -62,7 +62,7 @@ class BaseScreen {
             magicLinkComponents.path = "/magic-link"
             magicLinkComponents.queryItems = [URLQueryItem(name: "scheme", value: "wpdebug")]
 
-            safari.textFields["URL"].typeText("\(magicLinkComponents.url!.absoluteString)\n")
+            urlBar.typeText("\(magicLinkComponents.url!.absoluteString)\n")
 
             // Accept the prompt to open the deep link
             safari.scrollViews.element(boundBy: 0).buttons.element(boundBy: 1).tap()

From ab4ae28c4046a867a3c4142536e898eed95987fa Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sat, 14 Sep 2019 16:23:12 -0400
Subject: [PATCH 40/47] Fix clearTextIfNeeded for iOS 13

---
 .../WordPressUITests/Utils/XCTest+Extensions.swift  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift b/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift
index ac357172a6d5..59a675df817b 100644
--- a/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift
+++ b/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift
@@ -16,12 +16,11 @@ extension XCUIElement {
      */
     func clearTextIfNeeded() -> Void {
         let app = XCUIApplication()
-        let content = self.value as! String
 
-        if content.count > 0 && content != self.placeholderValue {
-            self.press(forDuration: 1.2)
-            app.menuItems.element(boundBy: 1).tap() // Select All (in the text edit menu)
-            app.menuItems.element(boundBy: 0).tap() // Cut (in the text edit menu)
+        self.tap()
+
+        for _ in 0...(self.stringValue?.count ?? 0) {
+            app.keys["delete"].tap()
         }
     }
 
@@ -34,6 +33,10 @@ extension XCUIElement {
         self.tap()
         self.typeText(text)
     }
+
+    var stringValue: String? {
+        return self.value as? String
+    }
 }
 
 extension XCTestCase {

From 6c4dea1d2a26f1ce5d06a42a99ef73638de25b68 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sat, 14 Sep 2019 16:39:57 -0400
Subject: [PATCH 41/47] Fix login epilogue issue in XC11

---
 WordPress/Classes/ViewRelated/NUX/EpilogueUserInfoCell.swift    | 1 +
 .../WordPressUITests/Screens/Login/LoginEpilogueScreen.swift    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/Classes/ViewRelated/NUX/EpilogueUserInfoCell.swift b/WordPress/Classes/ViewRelated/NUX/EpilogueUserInfoCell.swift
index 7ae75b6ea3e8..1f29af2f82dd 100644
--- a/WordPress/Classes/ViewRelated/NUX/EpilogueUserInfoCell.swift
+++ b/WordPress/Classes/ViewRelated/NUX/EpilogueUserInfoCell.swift
@@ -62,6 +62,7 @@ class EpilogueUserInfoCell: UITableViewCell {
         let username = userInfo.username.characterCount > 0 ? "@\(userInfo.username)" : ""
         usernameLabel.text = showEmail ? userInfo.email : username
         usernameLabel.fadeInAnimation()
+        usernameLabel.accessibilityIdentifier = "login-epilogue-username-label"
 
         gravatarAddIcon.isHidden = !allowGravatarUploads
 
diff --git a/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift b/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift
index 1c64b93e5adc..714f3daf6c6e 100644
--- a/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift
+++ b/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift
@@ -2,7 +2,7 @@ import Foundation
 import XCTest
 
 private struct ElementStringIDs {
-    static let usernameField = "username"
+    static let usernameField = "login-epilogue-username-label"
     static let siteUrlField = "siteUrl"
     static let connectSiteButton = "connectSite"
     static let continueButton = "Continue"

From 9e8d7749a0bb00d74beeda188553198cb6ec3187 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sat, 14 Sep 2019 19:24:40 -0400
Subject: [PATCH 42/47] Make clearTextIfNeeded more efficient

---
 WordPress/WordPressUITests/Utils/XCTest+Extensions.swift | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift b/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift
index 59a675df817b..97f0fabf260e 100644
--- a/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift
+++ b/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift
@@ -17,11 +17,8 @@ extension XCUIElement {
     func clearTextIfNeeded() -> Void {
         let app = XCUIApplication()
 
-        self.tap()
-
-        for _ in 0...(self.stringValue?.count ?? 0) {
-            app.keys["delete"].tap()
-        }
+        self.press(forDuration: 1.2)
+        app.keys["delete"].tap()
     }
 
     /**

From a8fca3691eae0461cf1cf24ba0a06d4747591e5a Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sat, 14 Sep 2019 21:29:06 -0400
Subject: [PATCH 43/47] Update WPAuth to 1.9.0-beta.1

---
 Podfile      | 2 +-
 Podfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Podfile b/Podfile
index c804b4f1679a..ad53c022e671 100644
--- a/Podfile
+++ b/Podfile
@@ -176,7 +176,7 @@ target 'WordPress' do
     
     pod 'Gridicons', '~> 0.16'
 
-    pod 'WordPressAuthenticator', '~> 1.8.1-beta.2'
+    pod 'WordPressAuthenticator', '~> 1.9.0-beta.1'
     # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
 
diff --git a/Podfile.lock b/Podfile.lock
index 23d34353140e..40995d72548d 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -211,7 +211,7 @@ PODS:
   - WordPress-Aztec-iOS (1.9.0)
   - WordPress-Editor-iOS (1.9.0):
     - WordPress-Aztec-iOS (= 1.9.0)
-  - WordPressAuthenticator (1.8.1-beta.2):
+  - WordPressAuthenticator (1.9.0-beta.1):
     - 1PasswordExtension (= 1.8.5)
     - Alamofire (= 4.7.3)
     - CocoaLumberjack (~> 3.5)
@@ -301,7 +301,7 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.9.0)
-  - WordPressAuthenticator (~> 1.8.1-beta.2)
+  - WordPressAuthenticator (~> 1.9.0-beta.1)
   - WordPressKit (~> 4.5.0)
   - WordPressMocks (~> 0.0.5)
   - WordPressShared (~> 1.8.7)
@@ -492,7 +492,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
   WordPress-Aztec-iOS: e58c7ab55b0bae53418a705876093fed314b6586
   WordPress-Editor-iOS: 36114a1e155b0696939dba80989652c185e91e01
-  WordPressAuthenticator: 989acfe503d267e15d154d0c9ac9d5aab5792886
+  WordPressAuthenticator: a31342777b1da48c99682a0ba30d19556a0d29fb
   WordPressKit: 87ba4cce3f5269e26a09568a749ec1b8b2ba2267
   WordPressMocks: d8088f718439556ff3856d5881aef581740cd26a
   WordPressShared: 09cf184caa614835f5811e8609227165201e6d3e
@@ -503,6 +503,6 @@ SPEC CHECKSUMS:
   ZendeskSDK: ce880e75f12ae5dacaa3658f49e545f3c8471030
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: 5b13fe8dfd51d742f27e91fbc2cf2ecb41643867
+PODFILE CHECKSUM: 06655681c99b4a0013c1b680a55c549bed369433
 
 COCOAPODS: 1.6.1

From d9c601cff0d41e2b08eaf9b9e052eb4047381507 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sun, 15 Sep 2019 00:35:47 -0400
Subject: [PATCH 44/47] Cut a new version

---
 Scripts/fastlane/Deliverfile   | 2 +-
 config/Version.public.xcconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Scripts/fastlane/Deliverfile b/Scripts/fastlane/Deliverfile
index 1f11e7d1d232..5435a6b49c6d 100644
--- a/Scripts/fastlane/Deliverfile
+++ b/Scripts/fastlane/Deliverfile
@@ -5,7 +5,7 @@ screenshots_path "./screenshots/"
 app_identifier "org.wordpress"
 
 # Make sure to update these keys for a new version
-app_version "13.2.1"
+app_version "13.2.2"
 
 privacy_url({
   'default' => 'https://automattic.com/privacy/',
diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig
index c8a1f8f91465..e16b5a0713f0 100644
--- a/config/Version.public.xcconfig
+++ b/config/Version.public.xcconfig
@@ -1,4 +1,4 @@
 VERSION_SHORT=13.2.1
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=13.2.1.1
+VERSION_LONG=13.2.1.2

From ecb0aa5c0ba87b8f8395c046dcf3aa4d9e003078 Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sat, 14 Sep 2019 15:26:33 -0400
Subject: [PATCH 45/47] Remove #if XCODE11 conditionals

---
 .../UIColor+MurielColors.swift                | 201 ++++++++----------
 .../WPStyleGuide+ApplicationStyles.swift      |   2 -
 ...DomainSuggestionsTableViewController.swift |  10 +-
 .../Reader/ReaderDetailViewController.swift   |   4 -
 .../Shared/TitleSubtitleTextfieldHeader.swift |   8 +-
 .../Stats/Extensions/WPStyleGuide+Stats.swift |   2 -
 .../Countries/Map/CountriesMapView.swift      |   2 -
 7 files changed, 94 insertions(+), 135 deletions(-)

diff --git a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift
index b75efee4b43b..32a2e3b61dc8 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/UIColor+MurielColors.swift	
@@ -121,87 +121,77 @@ extension UIColor {
 extension UIColor {
     /// The most basic background: white in light mode, black in dark mode
     static var basicBackground: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .systemBackground
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .systemBackground
+        }
         return .white
     }
 
     /// Tertiary background
     static var tertiaryBackground: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .tertiarySystemBackground
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .tertiarySystemBackground
+        }
+
         return .neutral(.shade10)
     }
 
     /// Default text color: high contrast
     static var text: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .label
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .label
+        }
+
         return muriel(color: .text)
     }
 
     /// Secondary text color: less contrast
     static var textSubtle: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .secondaryLabel
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .secondaryLabel
+        }
+
         return muriel(color: .gray)
     }
 
     /// Very low contrast text
     static var textTertiary: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .tertiaryLabel
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .tertiaryLabel
+        }
+
         return UIColor.neutral(.shade20)
     }
 
     /// Very, very low contrast text
     static var textQuaternary: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .quaternaryLabel
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .quaternaryLabel
+        }
+
         return UIColor.neutral(.shade10)
     }
 
     static var textInverted = UIColor(light: .white, dark: .gray(.shade100))
     static var textPlaceholder: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .tertiaryLabel
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .tertiaryLabel
+        }
+
         return neutral(.shade30)
     }
     static var placeholderElement: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return UIColor(light: .systemGray5, dark: .systemGray4)
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return UIColor(light: .systemGray5, dark: .systemGray4)
+        }
+
         return .gray(.shade10)
     }
     static var placeholderElementFaded: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return UIColor(light: .systemGray6, dark: .systemGray5)
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return UIColor(light: .systemGray6, dark: .systemGray5)
+        }
+
         return .gray(.shade5)
     }
 
@@ -211,87 +201,78 @@ extension UIColor {
     // MARK: - Table Views
 
     static var divider: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .separator
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .separator
+        }
+
         return muriel(color: .divider)
     }
 
     /// WP color for table foregrounds (cells, etc)
     static var listForeground: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .secondarySystemGroupedBackground
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .secondarySystemGroupedBackground
+        }
+
         return .white
     }
 
     static var listForegroundUnread: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .tertiarySystemGroupedBackground
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .tertiarySystemGroupedBackground
+        }
+
         return .primary(.shade0)
     }
 
     static var listBackground: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .systemGroupedBackground
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .systemGroupedBackground
+        }
+
         return muriel(color: .gray, .shade0)
     }
 
     /// For icons that are present in a table view, or similar list
     static var listIcon: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .secondaryLabel
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .secondaryLabel
+        }
+
         return .neutral(.shade20)
     }
 
     /// For small icons, such as the badges on notification gravatars
     static var listSmallIcon: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .systemGray
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .systemGray
+        }
+
         return UIColor.neutral(.shade20)
     }
 
     static var filterBarBackground: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return UIColor(light: white, dark: .gray(.shade100))
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return UIColor(light: white, dark: .gray(.shade100))
+        }
+
         return white
     }
 
     static var filterBarSelected: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return UIColor(light: .primary, dark: .label)
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return UIColor(light: .primary, dark: .label)
+        }
+
         return .primary
     }
 
     /// For icons that are present in a toolbar or similar view
     static var toolbarInactive: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .secondaryLabel
-            }
-        #endif
+        if #available(iOS 13, *) {
+               return .secondaryLabel
+           }
+
         return .neutral(.shade30)
     }
 
@@ -305,29 +286,27 @@ extension UIColor {
     static var primaryButtonDownBorder = muriel(color: .accent, .shade90)
 
     static var secondaryButtonBackground: UIColor {
-        #if XCODE11
         if #available(iOS 13, *) {
             return UIColor(light: .white, dark: .systemGray5)
         }
-        #endif
+
         return .white
     }
 
     static var secondaryButtonBorder: UIColor {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                return .systemGray3
-            }
-        #endif
+        if #available(iOS 13, *) {
+            return .systemGray3
+        }
+
         return .neutral(.shade20)
     }
 
     static var secondaryButtonDownBackground: UIColor {
-        #if XCODE11
+
         if #available(iOS 13, *) {
             return .systemGray3
         }
-        #endif
+
         return .neutral(.shade20)
     }
 
@@ -339,24 +318,18 @@ extension UIColor {
 extension UIColor {
     // A way to create dynamic colors that's compatible with iOS 11 & 12
     convenience init(light: UIColor, dark: UIColor) {
-        #if XCODE11
-            if #available(iOS 13, *) {
-                self.init { traitCollection in
-                    if traitCollection.userInterfaceStyle == .dark {
-                        return dark
-                    } else {
-                        return light
-                    }
+        if #available(iOS 13, *) {
+            self.init { traitCollection in
+                if traitCollection.userInterfaceStyle == .dark {
+                    return dark
+                } else {
+                    return light
                 }
-            } else {
-                // in older versions of iOS, we assume light mode
-                self.init(color: light)
             }
-        #else
-            // ditto
+        } else {
+            // in older versions of iOS, we assume light mode
             self.init(color: light)
-        #endif
-
+        }
     }
 
     convenience init(color: UIColor) {
diff --git a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift
index c1e06290e760..d8e862c704d1 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift	
@@ -27,7 +27,6 @@ extension WPStyleGuide {
         navigationAppearance.barTintColor = .appBar
         navigationAppearance.barStyle = .black
 
-#if XCODE11
         if #available(iOS 13.0, *) {
             // Required to fix detail navigation controller appearance due to https://stackoverflow.com/q/56615513
             let appearance = UINavigationBarAppearance()
@@ -37,7 +36,6 @@ extension WPStyleGuide {
             navigationAppearance.standardAppearance = appearance
             navigationAppearance.scrollEdgeAppearance = navigationAppearance.standardAppearance
         }
-#endif
 
         let buttonBarAppearance = UIBarButtonItem.appearance()
         buttonBarAppearance.tintColor = .white
diff --git a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
index ebe2c1ed8d7d..422747378c25 100644
--- a/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
+++ b/WordPress/Classes/ViewRelated/NUX/DomainSuggestionsTableViewController.swift
@@ -99,13 +99,11 @@ class DomainSuggestionsTableViewController: NUXTableViewController {
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 
-        #if XCODE11
-            if #available(iOS 13, *) {
-                if traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle {
-                    tableView.reloadData()
-                }
+        if #available(iOS 13, *) {
+            if traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle {
+                tableView.reloadData()
             }
-        #endif
+        }
     }
 
     /// Fetches new domain suggestions based on the provided string
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift b/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift
index 12522e0ce945..b4df955ea2e8 100644
--- a/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift
+++ b/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift
@@ -300,14 +300,12 @@ open class ReaderDetailViewController: UIViewController, UIViewControllerRestora
         // split screen multitasking on the iPad.
         view.layoutIfNeeded()
 
-        #if XCODE11
         if #available(iOS 13.0, *) {
             if previousTraitCollection?.hasDifferentColorAppearance(comparedTo: traitCollection) == true {
                 reloadGradientColors()
                 configureRichText()
             }
         }
-        #endif
     }
 
 
@@ -538,13 +536,11 @@ open class ReaderDetailViewController: UIViewController, UIViewControllerRestora
         footerView.backgroundColor = .listForeground
         footerDivider.backgroundColor = .divider
 
-        #if XCODE11
         if #available(iOS 13.0, *) {
             if traitCollection.userInterfaceStyle == .dark {
                 attributionView.backgroundColor = .listBackground
             }
         }
-        #endif
 
         reloadGradientColors()
     }
diff --git a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift
index a62017b5fbc0..d30dce7bc3e3 100644
--- a/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift	
+++ b/WordPress/Classes/ViewRelated/Site Creation/Shared/TitleSubtitleTextfieldHeader.swift	
@@ -104,11 +104,9 @@ final class SearchTextField: UITextField {
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 
-        #if XCODE11
-            if #available(iOS 13, *) {
-                setIconImage()
-            }
-        #endif
+        if #available(iOS 13, *) {
+            setIconImage()
+        }
     }
 }
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Extensions/WPStyleGuide+Stats.swift b/WordPress/Classes/ViewRelated/Stats/Extensions/WPStyleGuide+Stats.swift
index 5859fbbfecf5..b927d330ee89 100644
--- a/WordPress/Classes/ViewRelated/Stats/Extensions/WPStyleGuide+Stats.swift
+++ b/WordPress/Classes/ViewRelated/Stats/Extensions/WPStyleGuide+Stats.swift
@@ -237,11 +237,9 @@ extension WPStyleGuide {
         }
 
         static var mapBackground: UIColor {
-            #if XCODE11
             if #available(iOS 13, *) {
                 return .systemGray5
             }
-            #endif
             return .neutral(.shade10)
         }
 
diff --git a/WordPress/Classes/ViewRelated/Stats/Period Stats/Countries/Map/CountriesMapView.swift b/WordPress/Classes/ViewRelated/Stats/Period Stats/Countries/Map/CountriesMapView.swift
index 39268d53a07b..3113ae34f635 100644
--- a/WordPress/Classes/ViewRelated/Stats/Period Stats/Countries/Map/CountriesMapView.swift	
+++ b/WordPress/Classes/ViewRelated/Stats/Period Stats/Countries/Map/CountriesMapView.swift	
@@ -64,13 +64,11 @@ class CountriesMapView: UIView, NibLoadable {
     }
 
     private func mapColors() -> [UIColor] {
-        #if XCODE11
         if #available(iOS 13, *) {
             if traitCollection.userInterfaceStyle == .dark {
                 return [.accent(.shade90), .accent]
             }
         }
-        #endif
         return [.accent(.shade5), .accent]
     }
 }

From b16aebf40785a759befbeb85781bd927537a21fd Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sat, 14 Sep 2019 18:15:06 -0400
Subject: [PATCH 46/47] Remove the XC11 Podfile code

Thanks @scoutharris!

# Conflicts:
#	Podfile.lock
---
 Podfile      | 18 +-----------------
 Podfile.lock |  2 +-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Podfile b/Podfile
index ad53c022e671..0183ebe055a1 100644
--- a/Podfile
+++ b/Podfile
@@ -191,23 +191,7 @@ target 'WordPress' do
     end
 
     
-    post_install do
-      
-        ## Append SDKVersions.xcconfig contents to WordPressAuthenticator config files
-        Dir.glob("Pods/Target Support Files/WordPressAuthenticator/*.xcconfig") do |xc_config_filename|
-          
-          ## Get WPAuth config file
-          xcconfig_path = "#{Dir.pwd}/#{xc_config_filename}"
-          xc_config = File.read(xcconfig_path)
-
-          ## Get WPiOS config file
-          custom_xcconfig_path = "#{Dir.pwd}/config/SDKVersions.xcconfig"
-          custom_xc_config = File.read(custom_xcconfig_path)
-
-          ## Write back to WPAuth config file, appending both configs.
-          File.open(xcconfig_path, 'w') { |file| file << xc_config << custom_xc_config }
-        end
-      
+    post_install do      
       
         ## Convert the 3rd-party license acknowledgements markdown into html for use in the app
         require 'commonmarker'
diff --git a/Podfile.lock b/Podfile.lock
index 40995d72548d..fd4253f2354f 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -503,6 +503,6 @@ SPEC CHECKSUMS:
   ZendeskSDK: ce880e75f12ae5dacaa3658f49e545f3c8471030
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: 06655681c99b4a0013c1b680a55c549bed369433
+PODFILE CHECKSUM: 62c60e8f5c912ac07ce5e69a11b05410a6584251
 
 COCOAPODS: 1.6.1

From d6299ee8670c9d750a8c99ef16f998296c39095d Mon Sep 17 00:00:00 2001
From: Jeremy Massel <jeremy.massel@gmail.com>
Date: Sun, 15 Sep 2019 09:35:58 -0400
Subject: [PATCH 47/47] Remove AppDelegate ifdefs

---
 WordPress/Classes/System/WordPressAppDelegate.swift | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/WordPress/Classes/System/WordPressAppDelegate.swift b/WordPress/Classes/System/WordPressAppDelegate.swift
index e070221805ed..a2837519df06 100644
--- a/WordPress/Classes/System/WordPressAppDelegate.swift
+++ b/WordPress/Classes/System/WordPressAppDelegate.swift
@@ -7,9 +7,7 @@ import WordPressComStatsiOS
 import WordPressShared
 import AlamofireNetworkActivityIndicator
 
-#if !XCODE11
 import ZendeskCoreSDK
-#endif
 
 class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
@@ -206,13 +204,11 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         printDebugLaunchInfoWithLaunchOptions(launchOptions)
         toggleExtraDebuggingIfNeeded()
 
-#if DEBUG
+        #if DEBUG
         KeychainTools.processKeychainDebugArguments()
-        #if !XCODE11
-            CoreLogger.enabled = true
-            CoreLogger.logLevel = .debug
+        CoreLogger.enabled = true
+        CoreLogger.logLevel = .debug
         #endif
-#endif
 
         ZendeskUtils.setup()