diff --git a/build-release b/Tools/build-release
similarity index 100%
rename from build-release
rename to Tools/build-release
diff --git a/Tools/xcode-coverage-report b/Tools/xcode-coverage-report
new file mode 100755
index 0000000..ea398d1
--- /dev/null
+++ b/Tools/xcode-coverage-report
@@ -0,0 +1,50 @@
+#!/bin/bash
+function printHelp() {
+cat <<HELP
+Usage: xcode-coverage-report [ -h ] | [ <build-directory> ]
+
+Reads Xcode coverage data and outputs it in a format suitable for phabit ingestion.
+HELP
+}
+
+build_dir=""
+while (( $# > 0 ))
+do
+    if [[ $1 == -h ]]
+    then
+        printHelp
+        exit 0
+    fi
+    if (( ${#build_dir} != 0 ))
+    then
+        echo ">>> Error: Build directory already set: '$build_dir'. Scanning '$1'." 1>&2
+        exit 1
+    fi
+    build_dir="$1"
+    shift
+done
+
+if (( ${#build_dir} == 0 ))
+then
+    if [ -e "./Build" ]
+    then
+        build_dir="./Build"
+    else
+        build_dir=".build"
+    fi
+fi
+
+test_run=$(echo  ./Build/Logs/Test/**/**/*.xccovarchive)
+if (( $(echo "$test_run" | wc -l) != 1 ))
+then
+    echo ">>> Error: can't find xccovarchive file: '$test_run'." 1>&2
+    exit 1
+fi
+
+while IFS= read -r file
+do
+    echo "File: \"$file\""
+    xcrun xccov view \
+        --file "$file" \
+        "$test_run"
+done < <(xcrun xccov view --file-list "$test_run")
diff --git a/XcodeGitHub/XGCommand.m b/XcodeGitHub/XGCommand.m
index 3afeabd..86a2357 100644
--- a/XcodeGitHub/XGCommand.m
+++ b/XcodeGitHub/XGCommand.m
@@ -153,10 +153,12 @@
         message:message
         statusURL:nil];
     if (error) return error;
+    
+    
 
     // Add a completion message to the PR:
     if ([botStatus.currentStep isEqualToString:@"completed"]) {
-        error = [pr addComment:[botStatus.formattedDetailString renderMarkDown]];
+        error = [pr addComment:[[botStatus formatDetailString:options.successMessage :options.failureMessage :options.perfectMessage] renderMarkDown]];
         if (error) return error;
     }
 
diff --git a/XcodeGitHub/XGCommandOptions.h b/XcodeGitHub/XGCommandOptions.h
index 5e047d2..4dc6628 100644
--- a/XcodeGitHub/XGCommandOptions.h
+++ b/XcodeGitHub/XGCommandOptions.h
@@ -18,6 +18,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (copy)   NSString*_Nullable xcodeServerPassword;  // Optional
 @property (copy)   NSString*_Nullable templateBotName;
 @property (copy)   NSString*_Nullable githubAuthToken;
+@property (copy)   NSString*_Nullable successMessage;
+@property (copy)   NSString*_Nullable failureMessage;
+@property (copy)   NSString*_Nullable perfectMessage;
 @property (assign) int  verbosity;
 @property (assign) BOOL dryRun;
 @property (assign) BOOL showStatusOnly;
diff --git a/XcodeGitHub/XGCommandOptions.m b/XcodeGitHub/XGCommandOptions.m
index b7ad1f9..b7c2b50 100644
--- a/XcodeGitHub/XGCommandOptions.m
+++ b/XcodeGitHub/XGCommandOptions.m
@@ -29,6 +29,9 @@ - (instancetype _Nonnull) initWithArgc:(int)argc argv:(char*const _Nullable[_Nul
         {"verbose",     no_argument,        NULL, 'v'},
         {"version",     no_argument,        NULL, 'V'},
         {"xcodeserver", required_argument,  NULL, 'x'},
+        {"successmessage",    no_argument,  NULL, 'S'},
+        {"failuremessage",    no_argument,  NULL, 'F'},
+        {"perfectmessage",    no_argument,  NULL, 'P'},
         {0, 0, 0, 0}
     };
 
@@ -54,6 +57,9 @@ - (instancetype _Nonnull) initWithArgc:(int)argc argv:(char*const _Nullable[_Nul
         case 'v':   self.verbosity++; break;
         case 'V':   self.showVersion = YES; break;
         case 'x':   self.xcodeServerName = [self.class stringFromParameter]; break;
+        case 'S':   self.successMessage = [self.class stringFromParameter]; break;
+        case 'F':   self.failureMessage = [self.class stringFromParameter]; break;
+        case 'P':   self.perfectMessage = [self.class stringFromParameter]; break;
         default:    self.badOptionsError = YES; break;
         }
     } while (c != -1 && !self.badOptionsError);
@@ -107,6 +113,14 @@ + (NSString*) helpString {
          "\n"
          "  -x, --xcodeserver <xcode-server-domain-name>\n"
          "      The network name of the xcode server.\n"
+         "  -S, --successmessage <custom-message>\n"
+         "      Optional custom integration success message.\n"
+         "\n"
+         "  -F, --failuremessage <custom-message>\n"
+         "      Optional custom integration failure message.\n"
+         "\n"
+         "  -P, --perfectmessage <custom-message>\n"
+         "      Optional custom perfect integration message.\n"
          "\n"
          "The tool returns 0 on success, otherwise a non-zero value.\n"
          "\n"
diff --git a/XcodeGitHub/XGXcodeBot.h b/XcodeGitHub/XGXcodeBot.h
index 8388fca..be77df7 100644
--- a/XcodeGitHub/XGXcodeBot.h
+++ b/XcodeGitHub/XGXcodeBot.h
@@ -80,10 +80,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, readonly) NSArray<NSString*>*_Nullable tags;
 
 @property (strong, readonly) NSString* summaryString;
-@property (strong, readonly) APFormattedString* formattedDetailString;
 
 @property (strong, readonly) NSURL* integrationLogURL;
 
+- (APFormattedString*) formatDetailString:(NSString*_Nullable) successMessage : (NSString*_Nullable) failureMessage : (NSString*_Nullable) perfectMessage;
+
 - (instancetype) initWithServerName:(NSString*_Nullable)serverName
                          dictionary:(NSDictionary*_Nullable)dictionary
                          NS_DESIGNATED_INITIALIZER;
diff --git a/XcodeGitHub/XGXcodeBot.m b/XcodeGitHub/XGXcodeBot.m
index abf3632..a3faaf0 100644
--- a/XcodeGitHub/XGXcodeBot.m
+++ b/XcodeGitHub/XGXcodeBot.m
@@ -132,112 +132,125 @@ - (NSString*) summaryString {
 _Test Coverage_: 65% (193 tests).
 */
 
-- (APFormattedString*) formattedDetailString {
+- (APFormattedString*) formatDetailString:(NSString*_Nullable)successMessage :(NSString*_Nullable) failureMessage :(NSString*_Nullable)perfectMessage {
     NSTimeInterval duration = [self.endedDate timeIntervalSinceDate:self.startedDate];
-    NSString*durationString = XGDurationStringFromTimeInterval(duration);
-
-    APFormattedString *apstring =
-        [[[[APFormattedString
-            plainText:@"Result of Integration %@", self.integrationNumber]
-            line]
-            italicText:@"Duration"]
-            plainText:@": %@\n", durationString];
-
-    if ([self.result isEqualToString:@"canceled"]) {
-        [[[apstring
-            plainText:@"Build was "]
-            boldText:@"**manually canceled**"]
-            plainText:@"."];
-        return apstring;
-    }
+       NSString*durationString = XGDurationStringFromTimeInterval(duration);
+
+       APFormattedString *apstring =
+           [[[[APFormattedString
+               plainText:@"Result of Integration %@", self.integrationNumber]
+               line]
+               italicText:@"Duration"]
+               plainText:@": %@\n", durationString];
+
+       if ([self.result isEqualToString:@"canceled"]) {
+           [[[apstring
+               plainText:@"Build was "]
+               boldText:@"**manually canceled**"]
+               plainText:@"."];
+           return apstring;
+       }
+       
+       [[apstring
+           italicText:@"Result"]
+           plainText:@": "];
+
+       if ([self.errorCount integerValue] > 0) {
+           [[[apstring
+             boldText:@"%@ errors, failing state: %@", self.errorCount, self.summaryString]
+             plainText:@"\n%@", failureMessage]
+            line];
+           return apstring;
+       }
+
+       if ([self.testFailureCount integerValue] > 0) {
+           [[[[apstring
+             plainText:@"%@", failureMessage]
+                 line]
+             boldText:@"Build failed %@ tests", self.testFailureCount]
+               plainText:@" out of %@", self.testsCount];
+           return apstring;
+       }
+
+       if ([self.testsCount integerValue] > 0 &&
+           [self.warningCount integerValue] > 0 &&
+           [self.analyzerWarningCount integerValue] > 0) {
+           [[[[[apstring
+               plainText:@"All %@ tests passed, but please ", self.testsCount]
+               boldText:@"fix %@ warnings", self.warningCount]
+               plainText:@" and "]
+               boldText:@"%@ analyzer warnings", self.analyzerWarningCount]
+               plainText:@"."];
+           if ([self.codeCoveragePercentage doubleValue] > 0) {
+               [[apstring
+                   italicText:@"\nTest Coverage"]
+                   plainText:@": %@%%", self.codeCoveragePercentage];
+           }
+           [[apstring plainText:@"\n%@", successMessage] line];
+           return apstring;
+       }
+
+       if ([self.testsCount integerValue] > 0 &&
+           [self.warningCount integerValue] > 0) {
+           [[apstring
+               plainText:@"All %@ tests passed, but please ", self.testsCount]
+               boldText:@"fix %@ warnings.", self.warningCount];
+           if ([self.codeCoveragePercentage doubleValue] > 0) {
+               [[apstring
+                   italicText:@"\nTest Coverage"]
+                   plainText:@": %@%%", self.codeCoveragePercentage];
+           }
+           [[apstring plainText:@"\n%@", successMessage] line];
+           return apstring;
+       }
+
+       if ([self.testsCount integerValue] > 0 &&
+           [self.analyzerWarningCount integerValue] > 0) {
+           [[apstring
+               plainText:@"All %@ tests passed, but please ", self.testsCount]
+               boldText:@"fix %@ analyzer warnings.", self.analyzerWarningCount];
+           if ([self.codeCoveragePercentage doubleValue] > 0) {
+               [[apstring
+                   italicText:@"\nTest Coverage"]
+                   plainText:@": %@%%", self.codeCoveragePercentage];
+           }
+           return apstring;
+       }
     
-    [[apstring
-        italicText:@"Result"]
-        plainText:@": "];
-
-    if ([self.errorCount integerValue] > 0) {
-        [apstring boldText:@"%@ errors, failing state: %@", self.errorCount, self.summaryString];
-        return apstring;
-    }
-
-    if ([self.testFailureCount integerValue] > 0) {
-        [[apstring boldText:@"Build failed %@ tests", self.testFailureCount]
-            plainText:@" out of %@", self.testsCount];
-        return apstring;
-    }
-
-    if ([self.testsCount integerValue] > 0 &&
-        [self.warningCount integerValue] > 0 &&
-        [self.analyzerWarningCount integerValue] > 0) {
-        [[[[[apstring
-            plainText:@"All %@ tests passed, but please ", self.testsCount]
-            boldText:@"fix %@ warnings", self.warningCount]
-            plainText:@" and "]
-            boldText:@"%@ analyzer warnings", self.analyzerWarningCount]
-            plainText:@"."];
-        if ([self.codeCoveragePercentage doubleValue] > 0) {
-            [[apstring
-                italicText:@"\nTest Coverage"]
-                plainText:@": %@%%", self.codeCoveragePercentage];
-        }
-        return apstring;
-    }
-
-    if ([self.testsCount integerValue] > 0 &&
-        [self.warningCount integerValue] > 0) {
-        [[apstring
-            plainText:@"All %@ tests passed, but please ", self.testsCount]
-            boldText:@"fix %@ warnings.", self.warningCount];
-        if ([self.codeCoveragePercentage doubleValue] > 0) {
-            [[apstring
-                italicText:@"\nTest Coverage"]
-                plainText:@": %@%%", self.codeCoveragePercentage];
-        }
-        return apstring;
-    }
-
-    if ([self.testsCount integerValue] > 0 &&
-        [self.analyzerWarningCount integerValue] > 0) {
-        [[apstring
-            plainText:@"All %@ tests passed, but please ", self.testsCount]
-            boldText:@"fix %@ analyzer warnings.", self.analyzerWarningCount];
-        if ([self.codeCoveragePercentage doubleValue] > 0) {
-            [[apstring
-                italicText:@"\nTest Coverage"]
-                plainText:@": %@%%", self.codeCoveragePercentage];
-        }
-        return apstring;
-    }
-
-    if ([self.errorCount integerValue] == 0 && [self.result isEqualToString:@"succeeded"]) {
-        if (self.testsCount.integerValue == 0) {
-            [apstring boldText:@"Perfect build! 👍"];
-        } else {
-            if (self.testFailureCount.integerValue == 0) {
-                [apstring boldText:@"Perfect build!"];
-                [apstring plainText:@" All %ld tests passed. 👍\n", (long) self.testsCount.integerValue];
-                if (self.codeCoveragePercentage.doubleValue > 0.0) {
-                    [[apstring
-                        italicText:@"Test Coverage"]
-                        plainText:@": %@%%", self.codeCoveragePercentage];
-                }
-            } else {
-                [apstring boldText:@"Perfect build!"];
-                [apstring plainText:@" But please fix %ld failing tests.\n", (long) self.testFailureCount.integerValue];
-                [[apstring
-                    italicText:@"Test Coverage"]
-                    plainText:@": %@%% (%@ tests).", self.codeCoveragePercentage, self.testsCount];
-            }
-        }
-        return apstring;
-    }
-
-    [apstring boldText:@"Failing state: %@.", self.summaryString];
-    if ([self.tags containsObject:@"xcs-upgrade"]) {
-        [apstring italicText:@"\nThe current configuration may not be supported by the Xcode upgrade."];
-    }
-
-    return apstring;
+       if ([self.testsCount integerValue] == 0) {
+           [apstring boldText:@"Build Succeeded"];
+           [apstring plainText:@"\nNo tests ran on this integration"];
+           [apstring plainText:@"\n%@", successMessage];
+           return apstring;
+       }
+
+       if ([self.errorCount integerValue] == 0 && [self.result isEqualToString:@"succeeded"]) {
+           if (self.testFailureCount.integerValue == 0) {
+               [apstring boldText:@"Perfect build!"];
+               [apstring plainText:@" All %ld tests passed. 👍\n", (long) self.testsCount.integerValue];
+               if (self.codeCoveragePercentage.doubleValue > 0.0) {
+                   [[apstring
+                       italicText:@"Test Coverage"]
+                       plainText:@": %@%%", self.codeCoveragePercentage];
+               }
+           } else {
+               [apstring boldText:@"Perfect build!"];
+               [apstring plainText:@" But please fix %ld failing tests.\n", (long) self.testFailureCount.integerValue];
+               [[apstring
+                   italicText:@"Test Coverage"]
+                   plainText:@": %@%% (%@ tests).", self.codeCoveragePercentage, self.testsCount];
+           }
+           [apstring plainText:@"\n%@", perfectMessage];
+           return apstring;
+       }
+
+       [apstring boldText:@"Failing state: %@.", self.summaryString];
+       [apstring plainText:@"\n%@", failureMessage];
+       if ([self.tags containsObject:@"xcs-upgrade"]) {
+           [apstring italicText:@"\nThe current configuration may not be supported by the Xcode upgrade."];
+       }
+
+       return apstring;
 }
 
 - (NSURL*) integrationLogURL {
diff --git a/xcode-github-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/xcode-github-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
index 0c67376..f9b0d7c 100644
--- a/xcode-github-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/xcode-github-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
 </plist>
diff --git a/xcode-github-app/XGAPreferencesViewController.xib b/xcode-github-app/XGAPreferencesViewController.xib
index 31ba7fb..dc85f74 100644
--- a/xcode-github-app/XGAPreferencesViewController.xib
+++ b/xcode-github-app/XGAPreferencesViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -22,15 +22,15 @@
         <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="" animationBehavior="default" tabbingMode="disallowed" id="GJD-mm-6or">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="377" y="693" width="493" height="338"/>
+            <rect key="contentRect" x="377" y="693" width="493" height="500"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <value key="minSize" type="size" width="450" height="105"/>
             <view key="contentView" id="9lr-Zd-a11">
-                <rect key="frame" x="0.0" y="0.0" width="493" height="338"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <rect key="frame" x="0.0" y="0.0" width="493" height="500"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="9Wt-5C-o87">
-                        <rect key="frame" x="20" y="184" width="453" height="134"/>
+                        <rect key="frame" x="20" y="392" width="453" height="88"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="M6Q-tj-8Lq">
                                 <rect key="frame" x="0.0" y="-1" width="22" height="24"/>
@@ -59,13 +59,13 @@
                                 </connections>
                             </button>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m3O-1F-jYg">
-                                <rect key="frame" x="0.0" y="21" width="453" height="113"/>
+                                <rect key="frame" x="0.0" y="21" width="453" height="67"/>
                                 <clipView key="contentView" id="yyl-mG-Fts">
-                                    <rect key="frame" x="1" y="0.0" width="451" height="112"/>
+                                    <rect key="frame" x="1" y="0.0" width="451" height="66"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" headerView="zRw-ua-bUA" viewBased="YES" id="Llm-sj-s68">
-                                            <rect key="frame" x="0.0" y="0.0" width="451" height="89"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="451" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -88,9 +88,11 @@
                                                             <rect key="frame" x="1" y="1" width="220" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cxk-8I-29r">
+                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="cxk-8I-29r">
                                                                     <rect key="frame" x="0.0" y="0.0" width="220" height="17"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="17" id="V11-2E-P3L"/>
+                                                                    </constraints>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="hi0-Wt-HY8">
                                                                         <font key="font" metaFont="system"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -105,6 +107,11 @@
                                                                     </connections>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="cxk-8I-29r" firstAttribute="leading" secondItem="z7D-c1-n7T" secondAttribute="leading" constant="2" id="Ntt-2U-ULS"/>
+                                                                <constraint firstItem="cxk-8I-29r" firstAttribute="centerY" secondItem="z7D-c1-n7T" secondAttribute="centerY" id="XcX-1V-8VV"/>
+                                                                <constraint firstItem="cxk-8I-29r" firstAttribute="centerX" secondItem="z7D-c1-n7T" secondAttribute="centerX" id="dLi-ws-scQ"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="cxk-8I-29r" id="dkT-Zj-PjQ"/>
                                                             </connections>
@@ -136,9 +143,11 @@
                                                             <rect key="frame" x="224" y="1" width="225" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Okf-Ml-bMC">
+                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Okf-Ml-bMC">
                                                                     <rect key="frame" x="0.0" y="0.0" width="225" height="17"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="17" id="Lf9-CB-TpR"/>
+                                                                    </constraints>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="wa3-3M-KwG">
                                                                         <font key="font" metaFont="system"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -153,6 +162,11 @@
                                                                     </connections>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="Okf-Ml-bMC" firstAttribute="centerX" secondItem="eih-jm-NR2" secondAttribute="centerX" id="Cap-9o-GhI"/>
+                                                                <constraint firstItem="Okf-Ml-bMC" firstAttribute="leading" secondItem="eih-jm-NR2" secondAttribute="leading" constant="2" id="I7x-D3-7jh"/>
+                                                                <constraint firstItem="Okf-Ml-bMC" firstAttribute="centerY" secondItem="eih-jm-NR2" secondAttribute="centerY" id="i1x-CV-FrG"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="Okf-Ml-bMC" id="JDp-tL-QCs"/>
                                                             </connections>
@@ -178,7 +192,7 @@
                                     </subviews>
                                 </clipView>
                                 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="8La-PI-91r">
-                                    <rect key="frame" x="1" y="95" width="432" height="16"/>
+                                    <rect key="frame" x="1" y="196" width="306" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="LRU-zb-eSE">
@@ -208,7 +222,7 @@
                         </constraints>
                     </customView>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="drg-zm-rHi" customClass="NSSecureTextField">
-                        <rect key="frame" x="20" y="120" width="453" height="22"/>
+                        <rect key="frame" x="20" y="330" width="453" height="21"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="center" drawsBackground="YES" id="OVV-Um-m2O">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -221,32 +235,18 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="beD-Gf-Dcr">
-                        <rect key="frame" x="18" y="147" width="457" height="17"/>
+                        <rect key="frame" x="18" y="356" width="457" height="16"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="GitHub Status Token" id="17o-5V-5PA">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <customView focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="1VB-54-2ze">
-                        <rect key="frame" x="35" y="25" width="424" height="75"/>
+                    <customView focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="1VB-54-2ze" userLabel="Refresh Preferences">
+                        <rect key="frame" x="35" y="236" width="424" height="74"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="lft-a9-WNu">
-                                <rect key="frame" x="-6" y="-7" width="93" height="32"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="55" id="t7Y-7Q-4uF"/>
-                                </constraints>
-                                <buttonCell key="cell" type="push" title="Reset All" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8df-dN-PjG">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="resetSettingsAction:" target="-2" id="64E-RM-Awu"/>
-                                    <outlet property="nextKeyView" destination="m3O-1F-jYg" id="6cW-L1-QUH"/>
-                                </connections>
-                            </button>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l6h-7u-oxM">
-                                <rect key="frame" x="92" y="53" width="64" height="22"/>
+                                <rect key="frame" x="92" y="53" width="64" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="64" id="tTW-e5-3oa"/>
                                 </constraints>
@@ -272,7 +272,7 @@
                                 </connections>
                             </textField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zN5-A4-6gK">
-                                <rect key="frame" x="158" y="56" width="103" height="17"/>
+                                <rect key="frame" x="158" y="56" width="103" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Refresh minutes" id="WVV-AW-E6W">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -293,10 +293,8 @@
                         </subviews>
                         <constraints>
                             <constraint firstItem="g28-HK-FSY" firstAttribute="top" secondItem="l6h-7u-oxM" secondAttribute="bottom" constant="10" id="2l8-gH-SAf"/>
-                            <constraint firstItem="lft-a9-WNu" firstAttribute="leading" secondItem="1VB-54-2ze" secondAttribute="leading" id="Doy-Q7-2kv"/>
                             <constraint firstItem="g28-HK-FSY" firstAttribute="leading" secondItem="1VB-54-2ze" secondAttribute="leading" constant="141" id="JSp-Kb-mz9"/>
                             <constraint firstAttribute="trailing" secondItem="g28-HK-FSY" secondAttribute="trailing" id="K3c-x4-quq"/>
-                            <constraint firstAttribute="bottom" secondItem="lft-a9-WNu" secondAttribute="bottom" id="Lbe-r0-6pe"/>
                             <constraint firstItem="l6h-7u-oxM" firstAttribute="top" secondItem="1VB-54-2ze" secondAttribute="top" id="ObN-Rg-v9z"/>
                             <constraint firstItem="zN5-A4-6gK" firstAttribute="centerY" secondItem="l6h-7u-oxM" secondAttribute="centerY" id="dF6-40-CnO"/>
                             <constraint firstItem="zN5-A4-6gK" firstAttribute="leading" secondItem="l6h-7u-oxM" secondAttribute="trailing" constant="4" id="ooh-M5-621"/>
@@ -304,15 +302,178 @@
                             <constraint firstAttribute="bottom" secondItem="g28-HK-FSY" secondAttribute="bottom" constant="29" id="z8w-u2-Q4c"/>
                         </constraints>
                     </customView>
+                    <stackView distribution="equalCentering" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="51C-Bm-1cv" userLabel="Custom Bot Messages Preferences">
+                        <rect key="frame" x="34" y="24" width="425" height="200"/>
+                        <subviews>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P7N-VF-DME">
+                                <rect key="frame" x="-2" y="180" width="176" height="20"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="20" id="P6e-qP-IE6"/>
+                                </constraints>
+                                <textFieldCell key="cell" lineBreakMode="clipping" title="Custom Bot Status Message" id="MwK-wr-9qt">
+                                    <font key="font" usesAppearanceFont="YES"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="ggk-5U-XV4" userLabel="Failure Message View">
+                                <rect key="frame" x="0.0" y="128" width="424" height="40"/>
+                                <subviews>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b1D-ZI-lBO">
+                                        <rect key="frame" x="10" y="12" width="78" height="17"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Failed Build" id="qBu-NA-vw5">
+                                            <font key="font" metaFont="system" size="14"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jf2-db-SS5">
+                                        <rect key="frame" x="137" y="10" width="275" height="21"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="275" id="Xib-dK-LIF"/>
+                                        </constraints>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="ECN-mx-tjh">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                        <connections>
+                                            <action selector="valueChanged:" target="-2" id="zXC-IM-wl6"/>
+                                            <binding destination="-2" name="value" keyPath="self.settings.failedBuildMessage" id="Osv-1r-FuU"/>
+                                        </connections>
+                                    </textField>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="Jf2-db-SS5" firstAttribute="centerY" secondItem="b1D-ZI-lBO" secondAttribute="centerY" id="1sU-KT-VCl"/>
+                                    <constraint firstAttribute="height" constant="40" id="E9b-MQ-uF8"/>
+                                    <constraint firstItem="b1D-ZI-lBO" firstAttribute="centerY" secondItem="ggk-5U-XV4" secondAttribute="centerY" id="g7m-OC-oAi"/>
+                                    <constraint firstAttribute="trailing" secondItem="Jf2-db-SS5" secondAttribute="trailing" constant="12" id="gpc-Bl-fpz"/>
+                                    <constraint firstItem="b1D-ZI-lBO" firstAttribute="leading" secondItem="ggk-5U-XV4" secondAttribute="leading" constant="12" id="t8I-Zz-UqA"/>
+                                </constraints>
+                            </customView>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="uos-3z-xN3" userLabel="Success Message View">
+                                <rect key="frame" x="0.0" y="80" width="424" height="40"/>
+                                <subviews>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Adv-qO-p8B">
+                                        <rect key="frame" x="10" y="12" width="111" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Successful Build" id="O4B-tc-OcS">
+                                            <font key="font" metaFont="system" size="14"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HYZ-xC-hU7">
+                                        <rect key="frame" x="137" y="9" width="275" height="22"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="275" id="D7s-SP-a3L"/>
+                                        </constraints>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="lho-el-T3V">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                        <connections>
+                                            <action selector="valueChanged:" target="-2" id="VAn-4y-4OJ"/>
+                                            <binding destination="-2" name="value" keyPath="self.settings.successfulBuildMessage" id="ery-Lg-s4o"/>
+                                        </connections>
+                                    </textField>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="HYZ-xC-hU7" secondAttribute="trailing" constant="12" id="0bQ-g1-N4H"/>
+                                    <constraint firstItem="HYZ-xC-hU7" firstAttribute="centerY" secondItem="Adv-qO-p8B" secondAttribute="centerY" id="Ktu-vS-jon"/>
+                                    <constraint firstItem="HYZ-xC-hU7" firstAttribute="baseline" secondItem="Adv-qO-p8B" secondAttribute="baseline" id="eBr-Vz-tQH"/>
+                                    <constraint firstAttribute="height" constant="40" id="jeu-ld-IA9"/>
+                                    <constraint firstItem="Adv-qO-p8B" firstAttribute="leading" secondItem="uos-3z-xN3" secondAttribute="leading" constant="12" id="rAv-Ei-K9t"/>
+                                    <constraint firstItem="HYZ-xC-hU7" firstAttribute="top" secondItem="uos-3z-xN3" secondAttribute="top" constant="9" id="rt9-Vm-dLD"/>
+                                    <constraint firstItem="Adv-qO-p8B" firstAttribute="centerY" secondItem="uos-3z-xN3" secondAttribute="centerY" id="s6e-sG-lGV"/>
+                                </constraints>
+                            </customView>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="44n-Kn-XmT" userLabel="Perfect Message View">
+                                <rect key="frame" x="0.0" y="32" width="425" height="40"/>
+                                <subviews>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZnV-15-d8f">
+                                        <rect key="frame" x="10" y="12" width="88" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Perfect Build" id="c67-xO-2Z2">
+                                            <font key="font" metaFont="system" size="14"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bLX-Rs-0VW">
+                                        <rect key="frame" x="138" y="9" width="275" height="22"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="275" id="ZmG-bO-ZJV"/>
+                                        </constraints>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="G3K-JH-HvO">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                        <connections>
+                                            <action selector="valueChanged:" target="-2" id="Jc2-Fw-VUa"/>
+                                            <binding destination="-2" name="value" keyPath="self.settings.perfectBuildMessage" id="I9e-QR-kqk"/>
+                                        </connections>
+                                    </textField>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="bLX-Rs-0VW" firstAttribute="centerY" secondItem="ZnV-15-d8f" secondAttribute="centerY" id="BBH-Ic-Xq8"/>
+                                    <constraint firstItem="ZnV-15-d8f" firstAttribute="centerY" secondItem="44n-Kn-XmT" secondAttribute="centerY" id="ES8-fm-TZQ"/>
+                                    <constraint firstItem="ZnV-15-d8f" firstAttribute="leading" secondItem="44n-Kn-XmT" secondAttribute="leading" constant="12" id="baS-2X-4QG"/>
+                                    <constraint firstAttribute="trailing" secondItem="bLX-Rs-0VW" secondAttribute="trailing" constant="12" id="dsB-HV-qaY"/>
+                                    <constraint firstAttribute="height" constant="40" id="gV8-zK-yqY"/>
+                                    <constraint firstItem="bLX-Rs-0VW" firstAttribute="top" secondItem="44n-Kn-XmT" secondAttribute="top" constant="9" id="pVn-qk-ce2"/>
+                                    <constraint firstItem="bLX-Rs-0VW" firstAttribute="baseline" secondItem="ZnV-15-d8f" secondAttribute="baseline" id="xuE-JF-B3J"/>
+                                </constraints>
+                            </customView>
+                            <button verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="lft-a9-WNu">
+                                <rect key="frame" x="-6" y="-7" width="93" height="35"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="24" id="Y1i-Uz-otO"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="55" id="t7Y-7Q-4uF"/>
+                                </constraints>
+                                <buttonCell key="cell" type="push" title="Reset All" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8df-dN-PjG">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="resetSettingsAction:" target="-2" id="64E-RM-Awu"/>
+                                    <outlet property="nextKeyView" destination="m3O-1F-jYg" id="6cW-L1-QUH"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="44n-Kn-XmT" firstAttribute="width" secondItem="51C-Bm-1cv" secondAttribute="width" id="4LR-t8-kEK"/>
+                            <constraint firstItem="uos-3z-xN3" firstAttribute="centerY" secondItem="51C-Bm-1cv" secondAttribute="centerY" id="OVh-et-OXd"/>
+                            <constraint firstItem="uos-3z-xN3" firstAttribute="top" secondItem="ggk-5U-XV4" secondAttribute="bottom" constant="8" symbolic="YES" id="deW-XE-ZZG"/>
+                            <constraint firstAttribute="height" constant="200" id="yoV-J2-M4k"/>
+                        </constraints>
+                        <visibilityPriorities>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                            <integer value="1000"/>
+                        </visibilityPriorities>
+                        <customSpacing>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                            <real value="3.4028234663852886e+38"/>
+                        </customSpacing>
+                    </stackView>
                 </subviews>
                 <constraints>
                     <constraint firstItem="1VB-54-2ze" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="9lr-Zd-a11" secondAttribute="leading" constant="20" id="5Je-45-KQ2"/>
                     <constraint firstItem="drg-zm-rHi" firstAttribute="top" secondItem="beD-Gf-Dcr" secondAttribute="bottom" constant="5" id="8AC-uv-Q66"/>
+                    <constraint firstAttribute="bottom" secondItem="51C-Bm-1cv" secondAttribute="bottom" constant="24" id="9eq-5W-bnj"/>
                     <constraint firstItem="drg-zm-rHi" firstAttribute="trailing" secondItem="beD-Gf-Dcr" secondAttribute="trailing" id="Cd6-aN-rLb"/>
+                    <constraint firstItem="51C-Bm-1cv" firstAttribute="top" secondItem="1VB-54-2ze" secondAttribute="bottom" constant="12" id="Hgh-Qo-d2f"/>
                     <constraint firstAttribute="trailing" secondItem="9Wt-5C-o87" secondAttribute="trailing" constant="20" id="LLz-cV-10F"/>
                     <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1VB-54-2ze" secondAttribute="trailing" constant="20" id="NbQ-Fr-d7P"/>
                     <constraint firstItem="beD-Gf-Dcr" firstAttribute="trailing" secondItem="9Wt-5C-o87" secondAttribute="trailing" id="QAU-ct-PYr"/>
-                    <constraint firstAttribute="bottom" secondItem="1VB-54-2ze" secondAttribute="bottom" constant="25" id="UCK-Cq-iyb"/>
+                    <constraint firstItem="51C-Bm-1cv" firstAttribute="centerX" secondItem="9lr-Zd-a11" secondAttribute="centerX" id="bu2-z1-cAG"/>
+                    <constraint firstItem="51C-Bm-1cv" firstAttribute="leading" secondItem="9lr-Zd-a11" secondAttribute="leading" constant="34" id="eSK-RY-hSL"/>
                     <constraint firstItem="1VB-54-2ze" firstAttribute="top" secondItem="drg-zm-rHi" secondAttribute="bottom" constant="20" id="fcG-vb-wPe"/>
                     <constraint firstItem="1VB-54-2ze" firstAttribute="centerX" secondItem="9lr-Zd-a11" secondAttribute="centerX" id="ggN-1c-A8e"/>
                     <constraint firstItem="drg-zm-rHi" firstAttribute="leading" secondItem="beD-Gf-Dcr" secondAttribute="leading" id="h4V-I9-pRN"/>
@@ -325,7 +486,7 @@
             <connections>
                 <outlet property="initialFirstResponder" destination="Llm-sj-s68" id="fdA-Ef-kaG"/>
             </connections>
-            <point key="canvasLocation" x="-1230.5" y="-873"/>
+            <point key="canvasLocation" x="-1230.5" y="-873.5"/>
         </window>
         <dictionaryController objectClassName="_NSDictionaryControllerKeyValuePair" id="oga-iZ-0jS">
             <connections>
diff --git a/xcode-github-app/XGASettings.h b/xcode-github-app/XGASettings.h
index 73ef0cd..8fcc8d8 100644
--- a/xcode-github-app/XGASettings.h
+++ b/xcode-github-app/XGASettings.h
@@ -37,6 +37,9 @@ FOUNDATION_EXPORT NSString*_Nonnull XGACleanString(NSString*_Nullable string);
 @property (assign) BOOL showDebugMessages;
 @property (assign) NSTimeInterval refreshSeconds;
 @property (copy)   NSString*gitHubToken;
+@property (copy)   NSString*failedBuildMessage;
+@property (copy)   NSString*perfectBuildMessage;
+@property (copy)   NSString*successfulBuildMessage;
 @property (strong, null_resettable) NSMutableDictionary<NSString*, XGAServer*>*servers;
 @property (strong, null_resettable) NSMutableArray<XGAGitHubSyncTask*>*gitHubSyncTasks;
 @end
diff --git a/xcode-github-app/XGASettings.m b/xcode-github-app/XGASettings.m
index 64fed7a..d2fb8ae 100644
--- a/xcode-github-app/XGASettings.m
+++ b/xcode-github-app/XGASettings.m
@@ -135,6 +135,75 @@ - (void) setGitHubToken:(NSString *)token {
     }
 }
 
+- (NSString*) failedBuildMessage {
+    @synchronized (self) {
+        NSError*error = nil;
+        NSString*message =
+            [BNCKeyChain retrieveValueForService:kXGAServiceName
+                key:@"FailedBuildMessage"
+                error:&error];
+        if (error) BNCLog(@"Can't retrieve Failed Build Message: %@.", error);
+        return message;
+    }
+}
+
+- (void) setFailedBuildMessage:(NSString *)message {
+    @synchronized (self) {
+        NSError *error =
+            [BNCKeyChain storeValue:message
+                forService:kXGAServiceName
+                key:@"FailedBuildMessage"
+                cloudAccessGroup:nil];
+        if (error) BNCLog(@"Can't retrieve Failed Build Message: %@.", error);
+    }
+}
+
+- (NSString*) successfulBuildMessage {
+    @synchronized (self) {
+        NSError*error = nil;
+        NSString*message =
+            [BNCKeyChain retrieveValueForService:kXGAServiceName
+                key:@"SuccessfulBuildMessage"
+                error:&error];
+        if (error) BNCLog(@"Can't retrieve successful Build Message: %@.", error);
+        return message;
+    }
+}
+
+- (void) setSuccessfulBuildMessage:(NSString *)message {
+    @synchronized (self) {
+        NSError *error =
+            [BNCKeyChain storeValue:message
+                forService:kXGAServiceName
+                key:@"SuccessfulBuildMessage"
+                cloudAccessGroup:nil];
+        if (error) BNCLog(@"Can't retrieve successful Build Message: %@.", error);
+    }
+}
+
+- (NSString*) perfectBuildMessage {
+    @synchronized (self) {
+        NSError*error = nil;
+        NSString*message =
+            [BNCKeyChain retrieveValueForService:kXGAServiceName
+                key:@"PerfectBuildMessage"
+                error:&error];
+        if (error) BNCLog(@"Can't retrieve Perfect Build Message: %@.", error);
+        return message;
+    }
+}
+
+- (void) setPerfectBuildMessage:(NSString *)message {
+    @synchronized (self) {
+        NSError *error =
+            [BNCKeyChain storeValue:message
+                forService:kXGAServiceName
+                key:@"PerfectBuildMessage"
+                cloudAccessGroup:nil];
+        if (error) BNCLog(@"Can't retrieve Perfect Build Message: %@.", error);
+    }
+}
+
 - (NSMutableDictionary<NSString*, XGAServer*>*) servers {
     @synchronized (self) {
         if (_servers == nil) _servers = [NSMutableDictionary new];
diff --git a/xcode-github-app/XGAStatusViewController.m b/xcode-github-app/XGAStatusViewController.m
index e2cc42c..9e7f7dd 100644
--- a/xcode-github-app/XGAStatusViewController.m
+++ b/xcode-github-app/XGAStatusViewController.m
@@ -433,6 +433,9 @@ - (void) updateSyncBots:(XGAGitHubSyncTask*)syncTask {
         options.xcodeServerPassword = server.password;
         options.templateBotName = syncTask.botNameForTemplate;
         options.githubAuthToken = XGASettings.shared.gitHubToken;
+        options.successMessage = XGASettings.shared.successfulBuildMessage;
+        options.perfectMessage = XGASettings.shared.perfectBuildMessage;
+        options.failureMessage = XGASettings.shared.failedBuildMessage;
         options.dryRun = XGASettings.shared.dryRun;
         error = XGUpdateXcodeBotsWithGitHub(options);
         if (error) {
diff --git a/xcode-github-app/XGAStatusViewItem.m b/xcode-github-app/XGAStatusViewItem.m
index d02f483..0a1d405 100644
--- a/xcode-github-app/XGAStatusViewItem.m
+++ b/xcode-github-app/XGAStatusViewItem.m
@@ -25,7 +25,7 @@ + (instancetype) newItemWithBot:(XGXcodeBot*)bot status:(XGXcodeBotStatus*)botSt
     status.botName = botStatus.botName;
 
     status.statusSummary = [APFormattedString boldText:@"%@", botStatus.summaryString];
-    status.statusDetail = botStatus.formattedDetailString;
+    status.statusDetail = [botStatus formatDetailString:XGASettings.shared.successfulBuildMessage :XGASettings.shared.failedBuildMessage :XGASettings.shared.perfectBuildMessage];
 
     status.repository = [NSString stringWithFormat:@"%@/%@", bot.repoOwner, bot.repoName];