diff --git a/.gitignore b/.gitignore
index 897a013b30..e26089dc29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ _algolia_api_key
 .ruby-version
 jekyll-algolia-*
 **/.asset_pipeline
-/_docs/_hidden/private_betas/*
diff --git a/Archive/academy/_site/404.html b/Archive/academy/_site/404.html
index 78607a1e9e..5df55d2e86 100644
--- a/Archive/academy/_site/404.html
+++ b/Archive/academy/_site/404.html
@@ -38,7 +38,7 @@
 
 
 <script type="text/javascript">
-  +function(a,p,P,b,y){appboy={};appboyQueue=[];for(var s="initialize destroy getDeviceId toggleAppboyLogging setLogger openSession changeUser requestImmediateDataFlush requestFeedRefresh subscribeToFeedUpdates requestContentCardsRefresh subscribeToContentCardsUpdates logCardImpressions logCardClick logCardDismissal logFeedDisplayed logContentCardsDisplayed logInAppMessageImpression logInAppMessageClick logInAppMessageButtonClick logInAppMessageHtmlClick subscribeToNewInAppMessages removeSubscription removeAllSubscriptions logCustomEvent logPurchase isPushSupported isPushBlocked isPushGranted isPushPermissionGranted registerAppboyPushMessages unregisterAppboyPushMessages submitFeedback trackLocation stopWebTracking resumeWebTracking wipeData ab ab.User ab.User.Genders ab.User.NotificationSubscriptionTypes ab.User.prototype.getUserId ab.User.prototype.setFirstName ab.User.prototype.setLastName ab.User.prototype.setEmail ab.User.prototype.setGender ab.User.prototype.setDateOfBirth ab.User.prototype.setCountry ab.User.prototype.setHomeCity ab.User.prototype.setLanguage ab.User.prototype.setEmailNotificationSubscriptionType ab.User.prototype.setPushNotificationSubscriptionType ab.User.prototype.setPhoneNumber ab.User.prototype.setAvatarImageUrl ab.User.prototype.setLastKnownLocation ab.User.prototype.setUserAttribute ab.User.prototype.setCustomUserAttribute ab.User.prototype.addToCustomAttributeArray ab.User.prototype.removeFromCustomAttributeArray ab.User.prototype.incrementCustomUserAttribute ab.User.prototype.addAlias ab.User.prototype.setCustomLocationAttribute ab.InAppMessage ab.InAppMessage.SlideFrom ab.InAppMessage.ClickAction ab.InAppMessage.DismissType ab.InAppMessage.OpenTarget ab.InAppMessage.ImageStyle ab.InAppMessage.TextAlignment ab.InAppMessage.Orientation ab.InAppMessage.CropType ab.InAppMessage.prototype.subscribeToClickedEvent ab.InAppMessage.prototype.subscribeToDismissedEvent ab.InAppMessage.prototype.removeSubscription ab.InAppMessage.prototype.removeAllSubscriptions ab.InAppMessage.Button ab.InAppMessage.Button.prototype.subscribeToClickedEvent ab.InAppMessage.Button.prototype.removeSubscription ab.InAppMessage.Button.prototype.removeAllSubscriptions ab.SlideUpMessage ab.ModalMessage ab.FullScreenMessage ab.HtmlMessage ab.ControlMessage ab.Feed ab.Feed.prototype.getUnreadCardCount ab.ContentCards ab.ContentCards.prototype.getUnviewedCardCount ab.Card ab.ClassicCard ab.CaptionedImage ab.Banner ab.ControlCard ab.WindowUtils display display.automaticallyShowNewInAppMessages display.showInAppMessage display.showFeed display.destroyFeed display.toggleFeed display.showContentCards display.hideContentCards display.toggleContentCards sharedLib".split(" "),i=0;i<s.length;i++){for(var m=s[i],k=appboy,l=m.split("."),j=0;j<l.length-1;j++)k=k[l[j]];k[l[j]]=(new Function("return function "+m.replace(/\./g,"_")+"(){appboyQueue.push(arguments); return true}"))()}appboy.getUser=function(){return new appboy.ab.User};appboy.getCachedFeed=function(){return new appboy.ab.Feed};appboy.getCachedContentCards=function(){return new appboy.ab.ContentCards};(y=p.createElement(P)).type='text/javascript';y.src='https://js.appboycdn.com/web-sdk/2.2/appboy.min.js';y.async=1;(b=p.getElementsByTagName(P)[0]).parentNode.insertBefore(y,b)}(window,document,'script');
+  +function(a,p,P,b,y){appboy={};appboyQueue=[];for(var s="initialize destroy getDeviceId toggleAppboyLogging setLogger openSession changeUser requestImmediateDataFlush requestFeedRefresh subscribeToFeedUpdates requestContentCardsRefresh subscribeToContentCardsUpdates logCardImpressions logCardClick logCardDismissal logFeedDisplayed logContentCardsDisplayed logInAppMessageImpression logInAppMessageClick logInAppMessageButtonClick logInAppMessageHtmlClick subscribeToNewInAppMessages removeSubscription removeAllSubscriptions logCustomEvent logPurchase isPushSupported isPushBlocked isPushGranted isPushPermissionGranted registerAppboyPushMessages unregisterAppboyPushMessages submitFeedback trackLocation stopWebTracking resumeWebTracking wipeData ab ab.DeviceProperties ab.User ab.User.Genders ab.User.NotificationSubscriptionTypes ab.User.prototype.getUserId ab.User.prototype.setFirstName ab.User.prototype.setLastName ab.User.prototype.setEmail ab.User.prototype.setGender ab.User.prototype.setDateOfBirth ab.User.prototype.setCountry ab.User.prototype.setHomeCity ab.User.prototype.setLanguage ab.User.prototype.setEmailNotificationSubscriptionType ab.User.prototype.setPushNotificationSubscriptionType ab.User.prototype.setPhoneNumber ab.User.prototype.setAvatarImageUrl ab.User.prototype.setLastKnownLocation ab.User.prototype.setUserAttribute ab.User.prototype.setCustomUserAttribute ab.User.prototype.addToCustomAttributeArray ab.User.prototype.removeFromCustomAttributeArray ab.User.prototype.incrementCustomUserAttribute ab.User.prototype.addAlias ab.User.prototype.setCustomLocationAttribute ab.InAppMessage ab.InAppMessage.SlideFrom ab.InAppMessage.ClickAction ab.InAppMessage.DismissType ab.InAppMessage.OpenTarget ab.InAppMessage.ImageStyle ab.InAppMessage.TextAlignment ab.InAppMessage.Orientation ab.InAppMessage.CropType ab.InAppMessage.prototype.subscribeToClickedEvent ab.InAppMessage.prototype.subscribeToDismissedEvent ab.InAppMessage.prototype.removeSubscription ab.InAppMessage.prototype.removeAllSubscriptions ab.InAppMessage.Button ab.InAppMessage.Button.prototype.subscribeToClickedEvent ab.InAppMessage.Button.prototype.removeSubscription ab.InAppMessage.Button.prototype.removeAllSubscriptions ab.SlideUpMessage ab.ModalMessage ab.FullScreenMessage ab.HtmlMessage ab.ControlMessage ab.Feed ab.Feed.prototype.getUnreadCardCount ab.ContentCards ab.ContentCards.prototype.getUnviewedCardCount ab.Card ab.ClassicCard ab.CaptionedImage ab.Banner ab.ControlCard ab.WindowUtils display display.automaticallyShowNewInAppMessages display.showInAppMessage display.showFeed display.destroyFeed display.toggleFeed display.showContentCards display.hideContentCards display.toggleContentCards sharedLib".split(" "),i=0;i<s.length;i++){for(var m=s[i],k=appboy,l=m.split("."),j=0;j<l.length-1;j++)k=k[l[j]];k[l[j]]=(new Function("return function "+m.replace(/\./g,"_")+"(){appboyQueue.push(arguments); return true}"))()}appboy.getUser=function(){return new appboy.ab.User};appboy.getCachedFeed=function(){return new appboy.ab.Feed};appboy.getCachedContentCards=function(){return new appboy.ab.ContentCards};(y=p.createElement(P)).type='text/javascript';y.src='https://js.appboycdn.com/web-sdk/2.3/appboy.min.js';y.async=1;(b=p.getElementsByTagName(P)[0]).parentNode.insertBefore(y,b)}(window,document,'script');
 
 
 appboy.initialize('bef30adf-6179-4b26-a3b5-42268996ad95', {
diff --git a/Archive/documentation/_site/404.html b/Archive/documentation/_site/404.html
index 78607a1e9e..5df55d2e86 100644
--- a/Archive/documentation/_site/404.html
+++ b/Archive/documentation/_site/404.html
@@ -38,7 +38,7 @@
 
 
 <script type="text/javascript">
-  +function(a,p,P,b,y){appboy={};appboyQueue=[];for(var s="initialize destroy getDeviceId toggleAppboyLogging setLogger openSession changeUser requestImmediateDataFlush requestFeedRefresh subscribeToFeedUpdates requestContentCardsRefresh subscribeToContentCardsUpdates logCardImpressions logCardClick logCardDismissal logFeedDisplayed logContentCardsDisplayed logInAppMessageImpression logInAppMessageClick logInAppMessageButtonClick logInAppMessageHtmlClick subscribeToNewInAppMessages removeSubscription removeAllSubscriptions logCustomEvent logPurchase isPushSupported isPushBlocked isPushGranted isPushPermissionGranted registerAppboyPushMessages unregisterAppboyPushMessages submitFeedback trackLocation stopWebTracking resumeWebTracking wipeData ab ab.User ab.User.Genders ab.User.NotificationSubscriptionTypes ab.User.prototype.getUserId ab.User.prototype.setFirstName ab.User.prototype.setLastName ab.User.prototype.setEmail ab.User.prototype.setGender ab.User.prototype.setDateOfBirth ab.User.prototype.setCountry ab.User.prototype.setHomeCity ab.User.prototype.setLanguage ab.User.prototype.setEmailNotificationSubscriptionType ab.User.prototype.setPushNotificationSubscriptionType ab.User.prototype.setPhoneNumber ab.User.prototype.setAvatarImageUrl ab.User.prototype.setLastKnownLocation ab.User.prototype.setUserAttribute ab.User.prototype.setCustomUserAttribute ab.User.prototype.addToCustomAttributeArray ab.User.prototype.removeFromCustomAttributeArray ab.User.prototype.incrementCustomUserAttribute ab.User.prototype.addAlias ab.User.prototype.setCustomLocationAttribute ab.InAppMessage ab.InAppMessage.SlideFrom ab.InAppMessage.ClickAction ab.InAppMessage.DismissType ab.InAppMessage.OpenTarget ab.InAppMessage.ImageStyle ab.InAppMessage.TextAlignment ab.InAppMessage.Orientation ab.InAppMessage.CropType ab.InAppMessage.prototype.subscribeToClickedEvent ab.InAppMessage.prototype.subscribeToDismissedEvent ab.InAppMessage.prototype.removeSubscription ab.InAppMessage.prototype.removeAllSubscriptions ab.InAppMessage.Button ab.InAppMessage.Button.prototype.subscribeToClickedEvent ab.InAppMessage.Button.prototype.removeSubscription ab.InAppMessage.Button.prototype.removeAllSubscriptions ab.SlideUpMessage ab.ModalMessage ab.FullScreenMessage ab.HtmlMessage ab.ControlMessage ab.Feed ab.Feed.prototype.getUnreadCardCount ab.ContentCards ab.ContentCards.prototype.getUnviewedCardCount ab.Card ab.ClassicCard ab.CaptionedImage ab.Banner ab.ControlCard ab.WindowUtils display display.automaticallyShowNewInAppMessages display.showInAppMessage display.showFeed display.destroyFeed display.toggleFeed display.showContentCards display.hideContentCards display.toggleContentCards sharedLib".split(" "),i=0;i<s.length;i++){for(var m=s[i],k=appboy,l=m.split("."),j=0;j<l.length-1;j++)k=k[l[j]];k[l[j]]=(new Function("return function "+m.replace(/\./g,"_")+"(){appboyQueue.push(arguments); return true}"))()}appboy.getUser=function(){return new appboy.ab.User};appboy.getCachedFeed=function(){return new appboy.ab.Feed};appboy.getCachedContentCards=function(){return new appboy.ab.ContentCards};(y=p.createElement(P)).type='text/javascript';y.src='https://js.appboycdn.com/web-sdk/2.2/appboy.min.js';y.async=1;(b=p.getElementsByTagName(P)[0]).parentNode.insertBefore(y,b)}(window,document,'script');
+  +function(a,p,P,b,y){appboy={};appboyQueue=[];for(var s="initialize destroy getDeviceId toggleAppboyLogging setLogger openSession changeUser requestImmediateDataFlush requestFeedRefresh subscribeToFeedUpdates requestContentCardsRefresh subscribeToContentCardsUpdates logCardImpressions logCardClick logCardDismissal logFeedDisplayed logContentCardsDisplayed logInAppMessageImpression logInAppMessageClick logInAppMessageButtonClick logInAppMessageHtmlClick subscribeToNewInAppMessages removeSubscription removeAllSubscriptions logCustomEvent logPurchase isPushSupported isPushBlocked isPushGranted isPushPermissionGranted registerAppboyPushMessages unregisterAppboyPushMessages submitFeedback trackLocation stopWebTracking resumeWebTracking wipeData ab ab.DeviceProperties ab.User ab.User.Genders ab.User.NotificationSubscriptionTypes ab.User.prototype.getUserId ab.User.prototype.setFirstName ab.User.prototype.setLastName ab.User.prototype.setEmail ab.User.prototype.setGender ab.User.prototype.setDateOfBirth ab.User.prototype.setCountry ab.User.prototype.setHomeCity ab.User.prototype.setLanguage ab.User.prototype.setEmailNotificationSubscriptionType ab.User.prototype.setPushNotificationSubscriptionType ab.User.prototype.setPhoneNumber ab.User.prototype.setAvatarImageUrl ab.User.prototype.setLastKnownLocation ab.User.prototype.setUserAttribute ab.User.prototype.setCustomUserAttribute ab.User.prototype.addToCustomAttributeArray ab.User.prototype.removeFromCustomAttributeArray ab.User.prototype.incrementCustomUserAttribute ab.User.prototype.addAlias ab.User.prototype.setCustomLocationAttribute ab.InAppMessage ab.InAppMessage.SlideFrom ab.InAppMessage.ClickAction ab.InAppMessage.DismissType ab.InAppMessage.OpenTarget ab.InAppMessage.ImageStyle ab.InAppMessage.TextAlignment ab.InAppMessage.Orientation ab.InAppMessage.CropType ab.InAppMessage.prototype.subscribeToClickedEvent ab.InAppMessage.prototype.subscribeToDismissedEvent ab.InAppMessage.prototype.removeSubscription ab.InAppMessage.prototype.removeAllSubscriptions ab.InAppMessage.Button ab.InAppMessage.Button.prototype.subscribeToClickedEvent ab.InAppMessage.Button.prototype.removeSubscription ab.InAppMessage.Button.prototype.removeAllSubscriptions ab.SlideUpMessage ab.ModalMessage ab.FullScreenMessage ab.HtmlMessage ab.ControlMessage ab.Feed ab.Feed.prototype.getUnreadCardCount ab.ContentCards ab.ContentCards.prototype.getUnviewedCardCount ab.Card ab.ClassicCard ab.CaptionedImage ab.Banner ab.ControlCard ab.WindowUtils display display.automaticallyShowNewInAppMessages display.showInAppMessage display.showFeed display.destroyFeed display.toggleFeed display.showContentCards display.hideContentCards display.toggleContentCards sharedLib".split(" "),i=0;i<s.length;i++){for(var m=s[i],k=appboy,l=m.split("."),j=0;j<l.length-1;j++)k=k[l[j]];k[l[j]]=(new Function("return function "+m.replace(/\./g,"_")+"(){appboyQueue.push(arguments); return true}"))()}appboy.getUser=function(){return new appboy.ab.User};appboy.getCachedFeed=function(){return new appboy.ab.Feed};appboy.getCachedContentCards=function(){return new appboy.ab.ContentCards};(y=p.createElement(P)).type='text/javascript';y.src='https://js.appboycdn.com/web-sdk/2.3/appboy.min.js';y.async=1;(b=p.getElementsByTagName(P)[0]).parentNode.insertBefore(y,b)}(window,document,'script');
 
 
 appboy.initialize('bef30adf-6179-4b26-a3b5-42268996ad95', {
diff --git a/Rakefile b/Rakefile
index 9a9ed4959b..2411913411 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,7 +48,7 @@ end
 
 namespace :docs do
   task :index do
-    if  ENV["SITE_URL"] == 'https://www.braze.com'
+    if ENV["SITE_URL"] == 'https://www.braze.com' && ENV["RACK_ENV"] == 'production'
       puts `bundle exec jekyll algolia`
     end
   end
diff --git a/_docs/_developer_guide/home.md b/_docs/_developer_guide/home.md
index 74df7d07d8..2aaef87c0c 100644
--- a/_docs/_developer_guide/home.md
+++ b/_docs/_developer_guide/home.md
@@ -46,7 +46,7 @@ guide_menu_list:
   - name: Windows Universal
     link: /docs/developer_guide/platform_integration_guides/windows_universal/initial_sdk_setup/
     fa_icon: fab fa-windows
-  - name: Wordpress
+  - name: Zapier/Wordpress
     link: /docs/partners/technology_partners/channel_extensions/workflow_automation/zapier_integration/
     fa_icon: fab fa-wordpress
   - name: Xamarin Android and Fire OS
diff --git a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/androidx_integration.md b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/androidx_integration.md
index ae5b33c49e..1983621f56 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/androidx_integration.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/androidx_integration.md
@@ -19,7 +19,9 @@ dependencies {
 }
 ```
 
->  If including `android-sdk-ui-x` in your `build.gradle`, you can remove `android-sdk-ui` from your `build.gradle`.
+{% alert important %}
+If including `android-sdk-ui-x` in your `build.gradle`, you can remove `android-sdk-ui` from your `build.gradle`.
+{% endalert %}
 
 ## Gradle Changes
 The following gradle properties are required when using AndroidX libraries with the Braze SDK:
@@ -30,7 +32,7 @@ android.useAndroidX=true
 ```
 
 ## SDK Migration
-Braze SDK imports should be migrated from the `android-sdk-ui` package to their `android-sdk-ui-x` package counterparts, where applicable. Only a subset of packages required AndroidX compatibility. For example, `com.appboy.ui.push` classes should be moved to `com.appboy.uix.push`. See the [Braze SDK Changelog][3] for a complete list of packages. 
+Braze SDK imports should be migrated from the `android-sdk-ui` package to their `android-sdk-ui-x` package counterparts, where applicable. Only a subset of packages required AndroidX compatibility. For example, `com.appboy.ui.push` classes should be moved to `com.appboy.uix.push`. See the [Braze SDK Changelog][3] for a complete list of packages.
 
 [1]: https://developer.android.com/jetpack/androidx/
 [2]: https://developer.android.com/jetpack/
diff --git a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/deep_linking.md b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/deep_linking.md
index f66eea8892..54f81c4564 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/deep_linking.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/deep_linking.md
@@ -13,9 +13,13 @@ Your delegate object should implement the `IAppboyNavigator` interface and be se
 
 See [`CustomAppboyNavigator.java`][1] for an example implementation.
 
->  You must also provide instructions for Braze to navigate to your app's (optional) News Feed implementation. To use Braze's default handling, call `AppboyNavigator.executeNewsFeedAction(context, uriAction)`.
+{% alert important %}  
+You must also provide instructions for Braze to navigate to your app's (optional) News Feed implementation. To use Braze's default handling, call `AppboyNavigator.executeNewsFeedAction(context, uriAction)`.
+{% endalert %}
 
->  Prior to v2.0.0, Braze Navigator was only used when opening in-app messages.
+{% alert note %}
+  Prior to v2.0.0, Braze Navigator was only used when opening in-app messages.
+{% endalert %}
 
 [1]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomAppboyNavigator.java
 [2]: https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#200
diff --git a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization.md b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization.md
index 53cb916fac..815e08d9f8 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization.md
@@ -52,7 +52,9 @@ For example, the following styles override would use the `bungee` font family fr
 </style>
 ```
 
->  Both `android:fontFamily` and `fontFamily` style attributes must be set to maintain compatibility across all SDK versions.
+{% alert warning %}
+  Both `android:fontFamily` and `fontFamily` style attributes must be set to maintain compatibility across all SDK versions.
+{% endalert %}
 
 [1]: https://developer.android.com/guide/topics/ui/look-and-feel/fonts-in-xml.html
 [2]: https://developer.android.com/guide/topics/ui/look-and-feel/fonts-in-xml.html#font-family
diff --git a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/locations_and_geofences.md b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/locations_and_geofences.md
index 069725ca0e..0da1934646 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/locations_and_geofences.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/advanced_use_cases/locations_and_geofences.md
@@ -7,7 +7,7 @@ search_rank: 5
 
 ## Locations & Geofences
 
-Geofences are only available in select Braze packages. For access please create a support ticket or speak with your Braze Customer Success Manager. Learn more in the [Braze Academy]({{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences/#locations--geofences).
+Geofences are only available in select Braze packages. For access please create a support ticket or speak with your Braze Customer Success Manager. Learn more in [Braze Docs]({{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences/#locations--geofences).
 
 To support geofences for Android:
 
@@ -15,7 +15,9 @@ To support geofences for Android:
 
 2. Braze location collection must not be disabled.
 
->  Braze location collection is enabled by default. To verify your location collection status on Android, ensure that `com_appboy_disable_location_collection` is not set to `true` in your `appboy.xml`.
+{% alert important %}
+  Braze location collection is enabled by default. To verify your location collection status on Android, ensure that `com_appboy_disable_location_collection` is not set to `true` in your `appboy.xml`.
+{% endalert %}
 
 ### Step 1: Update build.gradle
 
@@ -48,6 +50,15 @@ Add the Braze boot receiver to the `application` element of your `AndroidManifes
 </receiver>
 ```
 
+{% alert note %}
+If you are using a version of the Android SDK less than `2.3.0`, the following manifest
+declaration is also required:
+
+```
+<service android:name="com.appboy.services.AppboyGeofenceService"/>
+```
+{% endalert %}
+
 ### Step 3: Obtain Location Permissions from the End User
 
 For Android M and higher versions, you must request location permissions from the end user before gathering location information or registering geofences.
diff --git a/_docs/_developer_guide/platform_integration_guides/android/analytics/location_tracking.md b/_docs/_developer_guide/platform_integration_guides/android/analytics/location_tracking.md
index f4c37a9dde..7f51e49678 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/analytics/location_tracking.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/analytics/location_tracking.md
@@ -17,9 +17,11 @@ Or:
 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 ```
 
-> With the release of Android M, Android switched from an install-time to a runtime permissions model. To enable location tracking on devices running M and above, the app must explicitly receive permission to use location from the user (Braze will not do this). Once location permissions are obtained, Braze will automatically begin tracking location on the next session start. Devices running earlier versions of Android only require location permissions to be declared in the `AndroidManifest.xml`. For more information, visit Android's [permission documentation][2].
+{% alert important %}
+  With the release of Android M, Android switched from an install-time to a runtime permissions model. To enable location tracking on devices running M and above, the app must explicitly receive permission to use location from the user (Braze will not do this). Once location permissions are obtained, Braze will automatically begin tracking location on the next session start. Devices running earlier versions of Android only require location permissions to be declared in the `AndroidManifest.xml`. For more information, visit Android's [permission documentation](https://developer.android.com/training/permissions/index.html).
+{% endalert %}
 
-> `ACCESS_FINE_LOCATION` includes GPS data in reporting user location while `ACCESS_COARSE_LOCATION` includes data from the most battery-efficient non-GPS provider available (e.g. the network). Coarse location location will likely be sufficient for the majority of location data use-cases; however, under the runtime permissions model, receiving location permission from the user implicitly authorizes the collection of fine location data. You can read more about the differences between these location permissions and how you ought to utilize them [here][1].
+`ACCESS_FINE_LOCATION` includes GPS data in reporting user location while `ACCESS_COARSE_LOCATION` includes data from the most battery-efficient non-GPS provider available (e.g. the network). Coarse location location will likely be sufficient for the majority of location data use-cases; however, under the runtime permissions model, receiving location permission from the user implicitly authorizes the collection of fine location data. You can read more about the differences between these location permissions and how you ought to utilize them [here][1].
 
 ### Disabling Automatic Location Tracking
 
@@ -35,9 +37,8 @@ Then you can manually log single location data points via the setLastKnownLocati
 Appboy.getInstance(YOUR_ACTIVITY.this).getCurrentUser().setLastKnownLocation(LATITUDE_DOUBLE_VALUE, LONGITUDE_DOUBLE_VALUE, ALTITUDE_DOUBLE_VALUE, ACCURACY_DOUBLE_VALUE);
 ```
 
-See [here][3] for an implementation example of the above in our Droidboy sample app and [here in our Javadocs][4] for more information on the `setLastKnownLocation` method.
+See [our Android SDK repo][3] for an implementation example of the above in our Droidboy sample app and [here in our Javadocs][4] for more information on the `setLastKnownLocation` method.
 
 [1]: http://developer.android.com/guide/topics/location/strategies.html
-[2]: https://developer.android.com/training/permissions/index.html
-[3]: https://github.com/Appboy/android-sdk/blob/18ea58f58f84018022b107d42a648f638b137fca/droidboy/src/main/java/com/appboy/sample/PreferencesActivity.java#L73
+[3]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/PreferencesActivity.java#L129
 [4]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/AppboyUser.html#setLastKnownLocation-double-double-java.lang.Double-java.lang.Double-
diff --git a/_docs/_developer_guide/platform_integration_guides/android/analytics/logging_purchases.md b/_docs/_developer_guide/platform_integration_guides/android/analytics/logging_purchases.md
index 6244bb9526..c63e79b33f 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/analytics/logging_purchases.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/analytics/logging_purchases.md
@@ -24,11 +24,11 @@ Appboy.getInstance(YOUR_ACTIVITY.this).logPurchase(
    int quantity
 );
 ```
-Please note that if the product Identifier is empty, the purchase will not be logged to Braze.
+__If the product Identifier is empty, the purchase will not be logged to Braze.__ See the [Javadoc][8] for more information.
 
-See the [Javadoc][8] for more information.
-
->  If you pass in a value of 10 USD, and a quantity of 3 then that will log to the user's profile as 3 purchases of 10 dollars for a total of 30 dollars. Quantities must be less than or equal to 100. Values of purchases can be negative.
+{% alert tip %}
+  If you pass in a value of `10 USD`, and a quantity of `3` then that will log to the user's profile as 3 purchases of 10 dollars for a total of 30 dollars. Quantities must be less than or equal to 100. Values of purchases can be negative.
+{% endalert %}
 
 #### Adding Properties
 
diff --git a/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_custom_attributes.md b/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_custom_attributes.md
index 3dd530aa94..e4e6f71dc0 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_custom_attributes.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_custom_attributes.md
@@ -124,7 +124,10 @@ Appboy.getInstance(YOUR_ACTIVITY.this).getCurrentUser().setCustomUserAttributeTo
 );
 );
 ```
->  Dates passed to Braze with this method must either be in the [ISO 8601][3] format, e.g `2013-07-16T19:20:30+01:00` or in the `yyyy-MM-dd'T'HH:mm:ss.SSSZ` format e.g `2016-12-14T13:32:31.601-0800`
+
+{% alert warning %}
+  Dates passed to Braze with this method must either be in the [ISO 8601](http://en.wikipedia.org/wiki/ISO_8601) format (e.g `2013-07-16T19:20:30+01:00`) or in the `yyyy-MM-dd'T'HH:mm:ss.SSSZ` format (e.g `2016-12-14T13:32:31.601-0800`).
+{% endalert %}
 
 #### Setting a Custom Attribute with an Array Value
 The maximum number of elements in Custom Attribute Arrays defaults to 25. The maximum for individual arrays can be increased to up to 100 in the Braze Dashboard, under "Manage App Group -> Custom Attributes". Arrays exceeding the maximum number of elements will be truncated to contain the maximum number of elements. For more information on Custom Attribute Arrays and their behavior, see our [Documentation on Arrays][6].
@@ -168,7 +171,9 @@ To set up a subscription for your users (either email or push), call the functio
 | `SUBSCRIBED` | Subscribed, but not explicitly opted in |
 | `UNSUBSCRIBED` | Unsubscribed and/or explicitly opted out |
 
->  No explicit opt-in is required by Android to send users push notifications. When a user is registered for push, they are set to `SUBSCRIBED` rather than `OPTED_IN` by default. For more information on implementing subscriptions and explicit opt-ins, visit the topic on [Braze Academy][10].
+{% alert important %}
+No explicit opt-in is required by Android to send users push notifications. When a user is registered for push, they are set to `SUBSCRIBED` rather than `OPTED_IN` by default. For more information on implementing subscriptions and explicit opt-ins, visit the topic in our [User Guide]({{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#managing-user-subscriptions).
+{% endalert %}
 
 #### Sample Code
 
@@ -190,8 +195,6 @@ Appboy.getInstance(YOUR_ACTIVITY.this).getCurrentUser().setPushNotificationSubsc
 
 [1]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/UserProfileDialog.java
 [2]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/AppboyUser.html "Javadocs"
-[3]: http://en.wikipedia.org/wiki/ISO_8601
 [4]: {{ site.baseurl }}/developer_guide/rest_api/user_data/#user-data
 [6]: {{ site.baseurl }}/developer_guide/platform_wide/analytics_overview/#arrays
 [7]: {{ site.baseurl }}/developer_guide/platform_wide/analytics_overview/#user-data-collection
-[10]: {{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#managing-user-subscriptions
diff --git a/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_user_ids.md b/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_user_ids.md
index 104d9154e9..610d81d601 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_user_ids.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/analytics/setting_user_ids.md
@@ -8,13 +8,17 @@ search_rank: 5
 
 User IDs should be set for each of your users. These should be unchanging and accessible when a user opens the app. A database ID or a hashed email address/username is usually a good reference to use. We __strongly recommend__ providing this identifier as it will allow you to:
 
-- Track your users across devices and platforms, improving the quality of your behaviorial and demographic data.
+- Track your users across devices and platforms, improving the quality of your behavioral and demographic data.
 - Import data about your users using our [User Data API][1].
 - Target specific users with our [Messaging API][2] for both general and transactional messages.
 
->  If such an identifier is not available, Braze will assign a unique identifier to your users, but you will lack the capabilities above. You should avoid setting User IDs for users for whom you lack a unique identifier that is tied to them as an individual. Passing a device identifier offers no benefit versus the automatic anonymous user tracking Braze offers by default.
+{% alert note %}
+If such an identifier is not available, Braze will assign a unique identifier to your users, but you will lack the capabilities above. You should avoid setting User IDs for users for whom you lack a unique identifier that is tied to them as an individual. Passing a device identifier offers no benefit versus the automatic anonymous user tracking Braze offers by default.
+{% endalert %}
 
->  These User IDs should be private and not easily obtained (e.g. not a plain email address or username).
+{% alert warning %}
+These User IDs should be private and not easily obtained (e.g. not a plain email address or username).
+{% endalert %}
 
 ### Assigning a User ID
 
@@ -24,8 +28,11 @@ You should make the following call as soon as the user is identified (generally
 Appboy.getInstance(YOUR_ACTIVITY.this).changeUser(YOUR_USER_ID_STRING);
 ```
 
->  __Do not call `changeUser()` when a user logs out. `changeUser()` should only be called when the user logs into the application.__ Setting `changeUser()` to a static default value will associate ALL user activity with that default "user" until the user logs in again.
-Additionally, we recommend against changing the user ID when a user logs out, as it makes you unable to target the previously logged-in user with reengagement campaigns. If you anticipate multiple users on the same device, but only want to target one of them when your app is in a logged out state, we recommend separately keeping track of the user ID you want to target while logged out and switching back to that user ID as part of your app's logout process.
+{% alert warning %}
+__Do not call `changeUser()` when a user logs out. `changeUser()` should only be called when the user logs into the application.__ Setting `changeUser()` to a static default value will associate ALL user activity with that default "user" until the user logs in again.
+{% endalert %}
+
+Additionally, we recommend __against__ changing the user ID when a user logs out, as it makes you unable to target the previously logged-in user with reengagement campaigns. If you anticipate multiple users on the same device, but only want to target one of them when your app is in a logged out state, we recommend separately keeping track of the user ID you want to target while logged out and switching back to that user ID as part of your app's logout process.
 
 Refer to the [changeUser documentation][4] for more information.
 
@@ -52,7 +59,9 @@ Please note the following:
 - __Switching from one identified user to another is a relatively costly operation.__
   - When you request the user switch, the current session for the previous user is automatically closed and a new session is started. Furthermore, Braze will automatically make a data refresh request for the News Feed, slideup and other Braze resources for the new user.
 
-> If you opt to use a hash of a unique identifier as your userID take care to ensure that you're normalizing the input to your hashing function. For example, if you're going to use a hash of an email address, ensure that you're stripping leading and trailing whitespace from the input, and taking [localization problems][6] into account.
+{% alert tip %}
+If you opt to use a hash of a unique identifier as your userID take care to ensure that you're normalizing the input to your hashing function. For example, if you're going to use a hash of an email address, ensure that you're stripping leading and trailing whitespace from the input, and taking [localization problems](http://developer.android.com/reference/java/util/Locale.html#default_locale) into account.
+{% endalert %}
 
 ## Aliasing Users
 
diff --git a/_docs/_developer_guide/platform_integration_guides/android/customer_feedback.md b/_docs/_developer_guide/platform_integration_guides/android/customer_feedback.md
index 71e33b2191..f43e468d93 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/customer_feedback.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/customer_feedback.md
@@ -6,7 +6,9 @@ search_rank: 5
 ---
 # Customer Feedback
 
-_The Customer Feedback module has been deprecated and is not available to new integrations._
+{% alert warning %}
+The Customer Feedback module has been deprecated and is not available to new integrations.
+{% endalert %}
 
 The Braze feedback form allows users to submit feedback about your app that is immediately sent to your company's dashboard.
 
@@ -14,7 +16,9 @@ The Braze feedback form allows users to submit feedback about your app that is i
 
 In Android, the News Feed and feedback form are implemented as [Fragments][2] that are available in the Braze Android UI project. View [Google's documentation on Fragments][3] for information on how to add a Fragment to an Activity.
 
->  The Android UI Fragments do not automatically track session analytics. To ensure that sessions are tracked correctly, you should call `IAppboy.openSession()` when your app is opened (learn more about [tracking user sessions][6]).
+{% alert important %}
+The Android UI Fragments do not automatically track session analytics. To ensure that sessions are tracked correctly, you should call `IAppboy.openSession()` when your app is opened. Learn more about [tracking user sessions]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/).
+{% endalert %}
 
 ## Braze Feedback Form
 
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/advanced_notes.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/advanced_notes.md
deleted file mode 100644
index ef85b5565b..0000000000
--- a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/advanced_notes.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-nav_title: Advanced Notes
-page_order: 6
-search_rank: 5
-platform: Android
----
-
-# Advanced Notes
-
-## Android Dialogs
-
-Braze doesn't support displaying in-app messages in [Android Dialogs][39] at this time.
-
-## Button Text Capitalization
-
-Android Material Design specifies that Button text should be upper case by default. Braze's in-app message buttons follow this convention as well.
-
-## Youtube in HTML in-app messages
-
-Starting in Braze Android SDK version 2.0.1, Youtube and other HTML5 content can play in HTML in-app messages. This requires hardware acceleration to be enabled in the Activity where the in-app message is being displayed, please see the [Android developer guide][71] for more details. Also that hardware acceleration is only available on API versions 11 and above.
-
-{% include archive/troubleshooting_iams.md platform="Android" %}
-
-[39]: https://developer.android.com/guide/topics/ui/dialogs.html
-[71]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/customization.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/customization.md
index 65719231c5..09126d059a 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/customization.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/customization.md
@@ -7,6 +7,8 @@ platform: Android
 
 # Customization {#in-app-message-customization}
 
+All of Braze’s in-app message types are highly customizable across messages, images, [Font Awesome][15]  icons, click actions, analytics, editable styling, custom display options, and custom delivery options. Multiple options can be configured on a per in-app message basis from [within the dashboard]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/). Braze additionally provides multiple levels of advanced customization to satisfy a variety of use cases and needs.
+
 ## Key-Value Pair Extras
 
 In-app message objects may carry key-value pairs as `extras`. They are specified on the dashboard under "Advanced Settings" when creating an in-app message campaign. These can be used to send data down along with an in-app message for further handling by the application.
@@ -65,7 +67,9 @@ Here is a truncated example with a custom font family, `my_custom_font_family`,
 
 Aside from the `Appboy.InAppMessage.Button` style for button text, the style for message text is `Appboy.InAppMessage.Message` and the style for message headers is `Appboy.InAppMessage.Header`. If you want to use your custom font family across all possible in-app message text, you can set your font family on the `Appboy.InAppMessage` style, which is the parent style for all in-app messages.
 
->  As with other custom styles, the entire style must be copied over to your local `styles.xml` file for all attributes to be correctly set.
+{% alert important %}
+As with other custom styles, the entire style must be copied over to your local `styles.xml` file for all attributes to be correctly set.
+{% endalert %}
 
 ## Setting Custom Listeners
 
@@ -73,13 +77,13 @@ Before customizing in-app messages with custom listeners, it's important to unde
 
 `AppboyInAppMessageManager` manages in-app message display on Android.  It contains helper class instances that help it manage the lifecycle and display of in-app messages. All of these classes have standard implementations and defining custom classes is completely optional. However, doing so can add another level of control over the display and behavior of in-app messages.  These customizable classes include:
 
-- [`IInAppMessageManagerListener`][21] - Implement to [custom manage in-app message display and behavior][19].
-- [`IInAppMessageViewFactory`][42] - Implement to [build custom in-app message views][12].
-- [`IInAppMessageAnimationFactory`][20] - Implement to [define custom in-app message animations][22].
+- [`IInAppMessageManagerListener`][21] - Implement to [custom manage in-app message display and behavior](#setting-a-custom-manager-listener).
+- [`IInAppMessageViewFactory`][42] - Implement to [build custom in-app message views](#setting-a-custom-view-factory).
+- [`IInAppMessageAnimationFactory`][20] - Implement to [define custom in-app message animations](#setting-a-custom-animation-factory).
 
 ### Setting a Custom Manager Listener
 
-The `AppboyInAppMessageManager` automatically handles the display and lifecycle of in-app messages.  If you require more control over the lifecycle of a message, setting a custom manager listener will enable you to recieve the in-app message object at various points in the in-app message lifecycle, allowing you to handle its display yourself, perform further processing, react to user behavior, process the object's [Extras][14], and much more.
+The `AppboyInAppMessageManager` automatically handles the display and lifecycle of in-app messages.  If you require more control over the lifecycle of a message, setting a custom manager listener will enable you to receive the in-app message object at various points in the in-app message lifecycle, allowing you to handle its display yourself, perform further processing, react to user behavior, process the object's [Extras][14], and much more.
 
 #### Step 1: Implement an In-App Message Manager Listener
 
@@ -87,7 +91,7 @@ Create a class that implements [`IInAppMessageManagerListener`][21]
 
 The callbacks in your `IInAppMessageManagerListener` will be called at various points in the in-app message lifecycle.
 
-For example, if you set a custom manager listener, when an in-app message is received from Braze, the `beforeInAppMessageDisplayed()` method will be called. If this method returns true, that signals to `AppboyInAppMessageManager` that the in-app message will be handled by the host app and that it should not be displayed by Braze.  If false is returned, the `AppboyInAppMessageManager` attempts to display the in-app message.  This method should be used if you choose to display the in-app message in a customized manner.
+For example, if you set a custom manager listener, when an in-app message is received from Braze, the `beforeInAppMessageDisplayed()` method will be called. If your implementation of this method returns [`InAppMessageOperation.DISCARD`][83], that signals to Braze that the in-app message will be handled by the host app and should not be displayed by Braze. If `InAppMessageOperation.DISPLAY_NOW` is returned, Braze will attempt to display the in-app message. This method should be used if you choose to display the in-app message in a customized manner.
 
 `IInAppMessageManagerListener` also includes delegate methods for clicks on the message itself or one of the buttons.  A common use case would be intercepting a message when a button or message is clicked for further processing.
 
@@ -98,7 +102,7 @@ For example, if you set a custom manager listener, when an in-app message is rec
 Once your `IInAppMessageManagerListener` is created, call `AppboyInAppMessageManager.setCustomInAppMessageManagerListener()` to instruct `AppboyInAppMessageManager`
 to use your custom `IInAppMessageManagerListener` instead of the default listener.
 
->  We recommend setting your `IInAppMessageManagerListener` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom listener is set before any in-app message is displayed.
+We recommend setting your `IInAppMessageManagerListener` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom listener is set before any in-app message is displayed.
 
 See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for an example implementation.
 
@@ -142,11 +146,15 @@ The `InAppMessageOperation()` return value can be used to control when the messa
 
 See [`InAppMessageOperation.java`][45] for more details.
 
->  If you choose to `DISCARD` the in-app message and replace it with your own in-app message view, you will need to manually log in-app message clicks and impressions.
+{% alert tip %}
+If you choose to `DISCARD` the in-app message and replace it with your own in-app message view, you will need to manually log in-app message clicks and impressions.
+{% endalert %}
 
 On Android, this is done by calling `logClick` and `logImpression` on in-app messages, and `logButtonClick` on immersive in-app messages.
 
->  Once an in-app message has been placed on the stack, you can request for it to be retrieved and displayed at any time by calling [`AppboyInAppMessageManager.requestDisplayInAppMessage()`][67]. Calling this method requests Braze to display the next available in-app message from the stack.
+{% alert tip %}
+Once an in-app message has been placed on the stack, you can request for it to be retrieved and displayed at any time by calling [`AppboyInAppMessageManager.requestDisplayInAppMessage()`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#requestDisplayInAppMessage--). Calling this method requests Braze to display the next available in-app message from the stack.
+{% endalert %}
 
 ## Setting a Custom View Factory
 
@@ -163,7 +171,9 @@ Create a class that implements [`IInAppMessageViewFactory`][42]
 Once your `IInAppMessageViewFactory` is created, call `AppboyInAppMessageManager.setCustomInAppMessageViewFactory()` to instruct `AppboyInAppMessageManager`
 to use your custom `IInAppMessageViewFactory` instead of the default view factory.
 
->  We recommend setting your `IInAppMessageViewFactory` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom view factory is set before any in-app message is displayed.
+{% alert tip %}
+We recommend setting your `IInAppMessageViewFactory` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom view factory is set before any in-app message is displayed.
+{% endalert %}
 
 See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for an example implementation.
 
@@ -175,12 +185,6 @@ Implementing `IInAppMessageView` allows you to define a certain portion of your
 
 - See [`CustomInAppMessageView.java`][26] in our Droidboy sample app for an implementation example.
 
-#### Client Example
-
-The following image is an example custom In-App Message view from a Braze client:
-
-![Foodo In-App Message Customization Example][33]
-
 ## Setting a Custom Animation Factory
 
 In-app messages have preset animation behavior. `Slideup` type messages slide into the screen; `full` and `modal` messages fade in and out.  If you would like to define custom animation behaviors for your in-app messages, Braze makes this possible via setting a custom animation factory.
@@ -196,7 +200,7 @@ Create a class that implements [`IInAppMessageAnimationFactory`][20]
 Once your `IInAppMessageAnimationFactory` is created, call `AppboyInAppMessageManager.setCustomInAppMessageAnimationFactory()` to instruct `AppboyInAppMessageManager`
 to use your custom `IInAppMessageAnimationFactory` instead of the default animation factory.
 
->  We recommend setting your `IInAppMessageAnimationFactory` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom animation factory is set before any in-app message is displayed.
+We recommend setting your `IInAppMessageAnimationFactory` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom animation factory is set before any in-app message is displayed.
 
 See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for an example implementation.
 
@@ -229,43 +233,56 @@ override fun beforeInAppMessageDisplayed(inAppMessage: IInAppMessage): InAppMess
 {% endtab %}
 {% endtabs %}
 
+## GIFs {#gifs-IAMs}
+
+{% include archive/android/gifs.md channel="in-app messages" %}
+
+## Android Dialogs
+
+Braze doesn't support displaying in-app messages in [Android Dialogs][85] at this time.
+
+## Youtube in HTML in-app messages
+
+Starting in Braze Android SDK version 2.0.1, Youtube and other HTML5 content can play in HTML in-app messages. This requires hardware acceleration to be enabled in the Activity where the in-app message is being displayed, please see the [Android developer guide][84] for more details. Also that hardware acceleration is only available on API versions 11 and above.
+
+
 [1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
 [2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
 [3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
 [4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
-[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
-[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
+[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/integration/#step-1-braze-in-app-message-manager-registration
+[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/res/values/styles.xml
 [7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
 [8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageImmersive.html
 [9]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageAnimationFactory.java
 [12]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-view-factory
 [13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
-[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/#key-value-pairs
+[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/key-value_pairs/
 [15]: http://fortawesome.github.io/Font-Awesome/
 [17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#modal-in-app-messages
 [18]: http://developer.android.com/reference/android/view/View.html
-[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-manager-listener
-[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageAnimationFactory.java
-[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
+[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/customization/#setting-custom-listeners
+[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/factories/AppboyInAppMessageAnimationFactory.java
+[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
 [22]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-animation-factory
 [23]: http://developer.android.com/reference/android/R.integer.html#config_shortAnimTime
-[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
-[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageView.java
+[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
+[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/IInAppMessageView.java
 [26]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageView.java
 [27]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageBase.html
 [28]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageImmersiveBase.html
 [29]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessage.java
 [30]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
 [33]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
-[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
+[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
 [36]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
 [39]: https://developer.android.com/guide/topics/ui/dialogs.html
 [40]: {{ site.baseurl }}/docs/developer_guide/platform_integration_guides/android/in-app_messaging/#html-full-in-app-messages
 [41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#full-in-app-messages
-[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
+[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
 [43]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageViewFactory.java
 [44]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html#getExtras--
-[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/InAppMessageOperation.java
 [50]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/MessageButton.html
 [51]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
 [52]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageHtml.html
@@ -291,3 +308,6 @@ override fun beforeInAppMessageDisplayed(inAppMessage: IInAppMessage): InAppMess
 [80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
 [81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
 [82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/main/java/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[84]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
+[85]: https://developer.android.com/guide/topics/ui/dialogs.html
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/gifs.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/gifs.md
deleted file mode 100644
index d030b68120..0000000000
--- a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/gifs.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-nav_title: GIFs
-page_order: 5
-search_rank: 5
-platform: Android
----
-
-# GIFs {#gifs-IAMs}
-
-{% include archive/android/gifs.md channel="in-app messages" %}
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/in-app_message_delivery.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/in-app_message_delivery.md
new file mode 100644
index 0000000000..24f8883d66
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/in-app_message_delivery.md
@@ -0,0 +1,193 @@
+---
+nav_title: In-App Message Delivery
+page_order: 3
+search_rank: 5
+platform: Android
+---
+
+# In-App Message Delivery
+
+### Trigger Types
+
+Our in-app message product allows you to trigger in-app message display as a result of several different event types: `Any Purchase`, `Specific Purchase`, `Session Start`, `Custom Event`, `Push Click`.  Furthermore, `Specific Purchase` and `Custom Event` triggers can contain robust property filters.
+
+{% alert note %}
+Triggered in-app messages only work with custom events logged through the SDK and not through the Rest APIs.  If you're working with Android, please check out how to log custom events [here]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_custom_events/#tracking-custom-events).
+{% endalert %}
+
+### Delivery Semantics
+
+All in-app messages that a user is eligible for are delivered to the user's device on session start. For more information about the SDK's session start semantics, see our [session lifecycle documentation][84]. Upon delivery, the SDK will pre-fetch assets so that they are available immediately at trigger time, minimizing display latency.
+
+When a trigger event has more than one eligible in-app message associated with it, only the in-app message with the highest priority will be delivered.
+
+For in-app messages that display immediately on deliver (*i.e.*, session start, push click) there can be some latency due to assets not being prefetched.
+
+### Minimum Time Interval Between Triggers
+
+By default, we rate limit in-app messages to once every 30 seconds to ensure a quality user experience.
+
+To override this value, set `com_appboy_trigger_action_minimum_time_interval_seconds` in your `appboy.xml`. An example can be found in our sample application's [`appboy.xml`][85].
+
+### Server-side Event Triggering
+
+By default in-app messages are triggered by custom events logged by the SDK. If you would like to trigger in-app messages by server sent events you are also able to achieve this.
+
+To enable this feature, a silent push is sent to the device which allows a custom push receiver to log an SDK based event. This SDK event will subsequently trigger the user-facing in-app message.
+
+### Step 1: Register a Custom Broadcast Receiver to Log Custom Event
+
+Register your custom `BroadcastReceiver` to listen for a specific silent push within your AndroidManifest.xml. For more information on how to register a custom `BroadcastReceiver` please review [Braze's push documentation][78].
+
+### Step 2: Create your BroadcastReceiver
+
+Your receiver will handle the intent broadcast by the silent push and log an SDK event. Starting in SDK 2.0.0, events can be logged in the background without issue. All clients implementing this solution must be on SDK v2.0.0+.
+
+It will subclass `BroadcastReceiver` and override `onReceive()`. For a detailed example, please see our [EventBroadcastReceiver.java][72] in the linked gist.
+
+>  Two events will be logged for the in-app message to be delivered, one by the server and one from within your custom `BroadcastReceiver`. To ensure the same event is not duplicated, the event logged from within your `BroadcastReceiver` should be given a generic naming convention, for example "in-app message trigger event," and not the same name as the server sent event. If this is not done segmentation and user data may be affected by duplicate events being logged for a single user action.
+
+For further details on custom handling push receipts, opens, and key-value pairs please visit this section of our [Documentation][78].
+
+### Step 3: Create a Push Campaign
+
+Create a silent push campaign which is triggered via the server sent event. For details on how to create a silent push campaign please review this section of our [User Guide][73].
+
+![serverEventTrigger][75]
+
+The push campaign must include key value pair extras which indicate that this push campaign is sent with the intention to log an SDK custom event. This event will be used to trigger the in-app message.
+
+![kvpConfiguration][76]
+
+The [EventBroadcastReceiver.java][72] recognizes the key value pairs and logs the appropriate SDK custom event.
+
+Should you want to include any event properties to attach to your 'In-App Message Trigger' event, you can achieve this by passing these in the key value pairs of the push payload. In the example above the campaign name of the subsequent in-app message has been included. Your custom `BroadcastReceiver` can then pass the value as the parameter of the event property when logging the custom event.
+
+###  Step 4: Create an In-App Message Campaign
+
+Create your user visible in-app message campaign from within Braze’s dashboard. This campaign should have an Action Based delivery, and be triggered from the custom event logged from within the custom [EventBroadcastReceiver.java][72].
+
+In the example below the specific in-app message to be triggered has been configured by sending the event property as part of the initial silent push.
+
+![serverEventTrigger][77]
+
+>  If a server sent event is logged whilst the app is not in the foreground, the event will log but the in-app message will not be displayed. Should you want the event to be delayed until the application is in the foreground, a check must be included in your custom push receiver to dismiss or delay the event until the app has entered the foreground.
+
+## Local In-App Messages
+
+In-app messages can be created within the app and displayed locally in real-time.  All customization options available on the dashboard are also available locally.  This is particularly useful for displaying messages that you wish to trigger within the app in real-time.
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+// Initializes a new slideup type in-app message and specifies its message.
+InAppMessageSlideup inAppMessage = new InAppMessageSlideup();
+inAppMessage.setMessage("Welcome to Braze! This is a slideup in-app message.");
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+// Initializes a new slideup type in-app message and specifies its message.
+val inAppMessage = InAppMessageSlideup()
+inAppMessage.message = "Welcome to Braze! This is a slideup in-app message."
+```
+
+{% endtab %}
+{% endtabs %}
+
+{% alert important %}
+Do not display in-app messages when the soft keyboard is displayed on screen, as rendering is undefined in this circumstance.
+{% endalert %}
+
+### Manually Triggering In-App Message Display
+
+The following method will manually display your in-app message.
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+AppboyInAppMessageManager.getInstance().addInAppMessage(inAppMessage);
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+AppboyInAppMessageManager.getInstance().addInAppMessage(inAppMessage)
+```
+
+{% endtab %}
+{% endtabs %}
+
+See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for example usage.
+
+
+[1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
+[2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
+[3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
+[4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
+[7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageImmersive.html
+[9]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageAnimationFactory.java
+[12]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-view-factory
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/#key-value-pairs
+[15]: http://fortawesome.github.io/Font-Awesome/
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#modal-in-app-messages
+[18]: http://developer.android.com/reference/android/view/View.html
+[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-manager-listener
+[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageAnimationFactory.java
+[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
+[22]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-animation-factory
+[23]: http://developer.android.com/reference/android/R.integer.html#config_shortAnimTime
+[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
+[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageView.java
+[26]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageView.java
+[27]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageBase.html
+[28]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageImmersiveBase.html
+[29]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessage.java
+[30]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
+[33]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
+[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
+[36]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[39]: https://developer.android.com/guide/topics/ui/dialogs.html
+[40]: {{ site.baseurl }}/docs/developer_guide/platform_integration_guides/android/in-app_messaging/#html-full-in-app-messages
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#full-in-app-messages
+[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
+[43]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageViewFactory.java
+[44]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html#getExtras()
+[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[50]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/MessageButton.html
+[51]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
+[52]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageHtml.html
+[53]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[54]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#in-app-message-customization
+[55]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#gifs-iams
+[59]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/#activity-lifecycle-callback-integration-api-14
+[60]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values-xlarge/styles.xml
+[65]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[66]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestInAppMessageRefresh--
+[67]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#requestDisplayInAppMessage--
+[68]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[69]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#ensureSubscribedToInAppMessageEvents-android.content.Context-
+[70]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/
+[71]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
+[72]: https://gist.github.com/robbiematthews/1d037e2c366e523b2dda5f2e053ea2a9
+[73]: {{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/push_notifications/silent_push_notifications/#silent-push-notifications
+[75]: {% image_buster /assets/img_archive/serverSentPush.png %}
+[76]: {% image_buster /assets/img_archive/kvpConfiguration.png %}
+[77]: {% image_buster /assets/img_archive/IAMeventTrigger.png %}
+[78]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#step-1-register-your-broadcastreceiver
+[79]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization/#font-customization
+[80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
+[81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
+[82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_custom_events/#tracking-custom-events
+[84]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/#session-lifecycle
+[85]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values/appboy.xml
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/integration.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/integration.md
index 10f67dc873..91f7d2e101 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/integration.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/integration.md
@@ -19,9 +19,11 @@ The [Activity Lifecycle Callback Integration][59] handles in-app message registr
 
 A manual in-app message registration requires 3 steps.
 
->  If you did the activity lifecycle integration, then you should *not* do a manual in-app message integration.
+{% alert warning %}
+  If you did the activity lifecycle integration, then you should *not* do a manual in-app message integration.
+{% endalert %}
 
-* In your [`Application.onCreate()`][82], [`ensureSubscribedToInAppMessageEvents()`][69] should be called.
+* In your [`Application.onCreate()`][82], call [`ensureSubscribedToInAppMessageEvents()`][69].
 
 {% tabs %}
 {% tab JAVA %}
@@ -141,7 +143,7 @@ public override fun onPause() {
 [53]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
 [54]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#in-app-message-customization
 [55]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#gifs-iams
-[59]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/#activity-lifecycle-callback-integration-api-14
+[59]: {{ site.baseurl}}/developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration/#activity-lifecycle-callback-integration-api-14
 [60]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values-xlarge/styles.xml
 [65]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
 [66]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestInAppMessageRefresh--
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/overview.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/overview.md
index fbc06cb791..90cf349a7c 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/overview.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/overview.md
@@ -4,8 +4,168 @@ page_order: 0
 search_rank: 5
 platform: Android
 ---
-# In-App Messaging
+# In-App Messages
 
-In-App Messages are great for creating unobtrusive calls to action, notifying people of new content in the News Feed and driving them toward it or communicating with users who have push turned off. They are also effective for other content that isn't time-sensitive enough to warrant a push notification, or permanent enough to warrant a News Feed item. You can find a detailed explanation of in-app message behavior in [Braze Academy][4].
+__In-App Messages__ help you get content to your user without interrupting their day with a push notification. Customized and tailored in-app messages enhance the user experience and help your audience get the most value out of your app. With a variety of layouts and customization tools to choose from, in-app messages engage your users more than ever before.
 
-[4]: {{ site.baseurl }}/help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+To see examples of in-app messages, check out our [Client Integration Gallery][83].
+
+{% comment %}
+Embed video on the right. Demos all of the topics mentioned on this page.
+{% endcomment %}
+
+{% alert note %}
+Braze has refreshed in-app messages! Though the creation process is very much the same, our in-app messages have a new, modern look and feel optimized for the best experiences for your customers and give you more options to personalize the experience. For more information on our most recent upgrades to in-app messages, check out our [Generation Comparison documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/generations/)!
+{% endalert %}
+
+[Create an in-app message]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/) now!
+
+## When to Use In-App Messages
+
+In-app messages are good for a lot of things. They can be used in web apps, Android apps, iOS apps, and more!
+
+In-app messages don't deliver outside of the user's app and won't intrude on their home screen, like push notifications do. In-app messages, by their nature, exist within your app and come with context and are almost never unwelcome! They're always delivered when the user is active within your app.
+
+### Great Use Cases
+
+- New App Features
+- App Management
+- Reviews
+- App Upgrades/Updates
+- Giveaways & Sweepstakes
+- Sales and Promotions
+- Product Sales
+- Encouraging and rewarding discovery
+- [Permission Requests/Push Priming][84]
+
+## In-App Message Types
+
+Braze offers several default in-app message types, each customizable with messages, images, [Font Awesome][15] icons, click actions, analytics, editable styling and color schemes.  The currently available types are `Slideup`, `Modal`, `Full`, and `HTML Full`.  It is also possible to [define your own custom in-app message view][12].
+
+All in-app messages implement the [`IInAppMessage`][3] interface, which defines basic behavior and traits for all in-app messages.  [`InAppMessageBase`][27] is an abstract class that implements `IInAppMessage` and provides the foundational in-app message implementation.  All in-app message classes are subclasses of `InAppMessageBase`.
+
+In addition, there is a subinterface of `IInAppMessage` called [`IInAppMessageImmersive`][8], which adds click action and analytics enabled [buttons][50], as well as header text and a close button.  [`InAppMessageImmersiveBase`][28] is an abstract class that implements `IInAppMessageImmersive` and provides the foundational `immersive` in-app message implementation.  `Modal` and `Full` in-app messages are subclasses of `InAppMessageImmersiveBase`.
+
+HTML Full in-app messages are [`InAppMessageHtmlFull`][51] instances, which implement [`IInAppMessageHtml`][52], another subclass of `IInAppMessage`.
+
+### Expected Behaviors by Message Types
+
+These are what each in-app message type will appear like for your users.
+
+{% tabs %}
+  {% tab Slideup %}
+  [`Slideup`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageSlideup.html) in-app messages are so-named because they "slide up" or "slide down" from the top or bottom of the screen.  They cover a small portion of the screen and provide an effective and non-intrusive messaging capability.
+
+  <br>
+
+  ![Slideup Behavior]({% image_buster /assets/img/slideup-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+{% endtab %}
+{% tab Modal %}
+[`Modal`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageModal.html) in-app messages appear in the center of the screen and are framed by a translucent panel. Useful for more critical messaging, they can be equipped with up to two click action and analytics enabled buttons.
+
+  <br>
+
+  ![Modal Behavior]({% image_buster /assets/img/modal-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+
+{% endtab %}
+{% tab Full Screen %}
+[`Full`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageFull.html) in-app messages are useful for maximizing the content and impact of your user communication.  The upper half of a `full` in-app message contains an image and the lower half displays text as well as up to two click action and analytics enabled buttons.
+
+![Full Example]({% image_buster /assets/img_archive/In-App_Full.png %})
+
+
+{% endtab %}
+{% tab Custom HTML %}
+[`HTML Full`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html) in-app messages are useful for creating fully customized user content. User-defined HTML Full in-app message content is displayed in a {% if include.platform == "iOS" %}`UIWebView`{% elsif include.platform == "Android" %}`WebView`{% endif %} and may optionally contain other rich content, such as images and fonts, allowing for full control over message appearance and functionality.
+
+<br>
+
+![Full-Screen Behavior]({% image_buster /assets/img/full-screen-behavior.gif %}){: style="border:0px;"}
+
+<br>
+
+Full in-app message content is displayed in a `UIWebView` and may optionally contain other rich content, such as images and fonts, allowing for full control over message appearance and functionality.
+
+{% alert important %}
+Please note that we currently do not support display of custom HTML in-app messages in an iFrame on the iOS and Android platforms.
+{% endalert %}
+
+{% endtab %}
+{% endtabs %}
+
+#### In-Depth: Defining Custom In-App Message Types
+
+Braze's `slideup` in-app message object extends [`InAppMessageBase`][27].  Braze's `full` and `modal` type messages extend [`InAppMessageImmersiveBase`][28].  Extending one of these classes gives you the option of adding custom functionality to your locally generated in-app messages.
+
+See [`CustomInAppMessage.java`][29] in the DroidBoy sample app for an example implementation.
+
+[1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
+[2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
+[3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
+[4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
+[7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageImmersive.html
+[9]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageAnimationFactory.java
+[12]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/customization/#setting-a-custom-view-factory
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/#key-value-pairs
+[15]: http://fortawesome.github.io/Font-Awesome/
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#modal-in-app-messages
+[18]: http://developer.android.com/reference/android/view/View.html
+[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-manager-listener
+[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageAnimationFactory.java
+[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
+[22]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-animation-factory
+[23]: http://developer.android.com/reference/android/R.integer.html#config_shortAnimTime
+[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
+[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageView.java
+[26]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageView.java
+[27]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageBase.html
+[28]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageImmersiveBase.html
+[29]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessage.java
+[30]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
+[33]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
+[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
+[36]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[39]: https://developer.android.com/guide/topics/ui/dialogs.html
+[40]: {{ site.baseurl }}/docs/developer_guide/platform_integration_guides/android/in-app_messaging/#html-full-in-app-messages
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#full-in-app-messages
+[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
+[43]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageViewFactory.java
+[44]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html#getExtras()
+[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[50]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/MessageButton.html
+[51]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
+[52]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageHtml.html
+[53]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[54]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#in-app-message-customization
+[55]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#gifs-iams
+[59]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/#activity-lifecycle-callback-integration-api-14
+[60]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values-xlarge/styles.xml
+[65]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[66]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestInAppMessageRefresh--
+[67]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#requestDisplayInAppMessage--
+[68]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[69]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#ensureSubscribedToInAppMessageEvents-android.content.Context-
+[70]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/
+[71]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
+[72]: https://gist.github.com/robbiematthews/1d037e2c366e523b2dda5f2e053ea2a9
+[73]: {{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/push_notifications/silent_push_notifications/#silent-push-notifications
+[75]: {% image_buster /assets/img_archive/serverSentPush.png %}
+[76]: {% image_buster /assets/img_archive/kvpConfiguration.png %}
+[77]: {% image_buster /assets/img_archive/IAMeventTrigger.png %}
+[78]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#step-1-register-your-broadcastreceiver
+[79]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization/#font-customization
+[80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
+[81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
+[82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: {{ site.baseurl }}/help/best_practices/client_integration_gallery/#client-integration-iam
+[84]: {{ site.baseurl }}/help/best_practices/push/creating_custom_opt-in_prompts/#creating-custom-opt-in-prompts
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/server-side_event_triggering.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/server-side_event_triggering.md
index f4cc6effc6..8dde38b241 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/server-side_event_triggering.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/server-side_event_triggering.md
@@ -1,113 +1,5 @@
 ---
-nav_title: Server-side Event Triggering
-page_order: 4
-search_rank: 5
-platform: Android
+hidden: true
+layout: redirect
+redirect_to: /docs/developer_guide/platform_integration_guides/android/in-app_messaging/in-app_message_delivery/
 ---
-
-# Server-side Event Triggering
-
-By default in-app messages are triggered by custom events logged by the SDK. If you would like to trigger in-app messages by server sent events you are also able to achieve this.
-
-To enable this feature, a silent push is sent to the device which allows a custom push receiver to log an SDK based event. This SDK event will subsequently trigger the user-facing in-app message.
-
-## Step 1: Register a Custom Broadcast Receiver to Log Custom Event
-
-Register your custom `BroadcastReceiver` to listen for a specific silent push within your AndroidManifest.xml. For more information on how to register a custom `BroadcastReceiver` please review [Braze's push documentation][78].
-
-## Step 2: Create your BroadcastReceiver
-
-Your receiver will handle the intent broadcast by the silent push and log an SDK event. Starting in SDK 2.0.0, events can be logged in the background without issue. All clients implementing this solution must be on SDK v2.0.0+.
-
-It will subclass `BroadcastReceiver` and override `onReceive()`. For a detailed example, please see our [EventBroadcastReceiver.java][72] in the linked gist.
-
->  Two events will be logged for the in-app message to be delivered, one by the server and one from within your custom `BroadcastReceiver`. To ensure the same event is not duplicated, the event logged from within your `BroadcastReceiver` should be given a generic naming convention, for example "in-app message trigger event," and not the same name as the server sent event. If this is not done segmentation and user data may be affected by duplicate events being logged for a single user action.
-
-For further details on custom handling push receipts, opens, and key-value pairs please visit this section of our [Documentation][78].
-
-## Step 3: Create a Push Campaign
-
-Create a silent push campaign which is triggered via the server sent event. For details on how to create a silent push campaign please review this section of our [Academy][73].
-
-![serverEventTrigger][75]
-
-The push campaign must include key value pair extras which indicate that this push campaign is sent with the intention to log an SDK custom event. This event will be used to trigger the in-app message
-
-![kvpConfiguration][76]
-
-The [EventBroadcastReceiver.java][72] recognizes the key value pairs and logs the appropriate SDK custom event.
-
-Should you want to include any event properties to attach to your 'In-App Message Trigger' event, you can achieve this by passing these in the key value pairs of the push payload. In the example above the campaign name of the subsequent in-app message has been included. Your custom `BroadcastReceiver` can then pass the value as the parameter of the event property when logging the custom event.
-
-##  Step 4: Create an In-App Message Campaign
-
-Create your user visible in-app message campaign from within Braze’s dashboard. This campaign should have an Action Based delivery, and be triggered from the custom event logged from within the custom [EventBroadcastReceiver.java][72].
-
-In the example below the specific in-app message to be triggered has been configured by sending the event property as part of the initial silent push.
-
-![serverEventTrigger][77]
-
->  If a server sent event is logged whilst the app is not in the foreground, the event will log but the in-app message will not be displayed. Should you want the event to be delayed until the application is in the foreground, a check must be included in your custom push receiver to dismiss or delay the event until the app has entered the foreground.
-
-[1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
-[2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
-[3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
-[4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
-[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
-[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
-[7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
-[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageImmersive.html
-[9]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageAnimationFactory.java
-[12]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-view-factory
-[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
-[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/#key-value-pairs
-[15]: http://fortawesome.github.io/Font-Awesome/
-[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#modal-in-app-messages
-[18]: http://developer.android.com/reference/android/view/View.html
-[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-manager-listener
-[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageAnimationFactory.java
-[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
-[22]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-animation-factory
-[23]: http://developer.android.com/reference/android/R.integer.html#config_shortAnimTime
-[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
-[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageView.java
-[26]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageView.java
-[27]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageBase.html
-[28]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageImmersiveBase.html
-[29]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessage.java
-[30]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
-[33]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
-[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
-[36]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
-[39]: https://developer.android.com/guide/topics/ui/dialogs.html
-[40]: {{ site.baseurl }}/docs/developer_guide/platform_integration_guides/android/in-app_messaging/#html-full-in-app-messages
-[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#full-in-app-messages
-[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
-[43]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageViewFactory.java
-[44]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html#getExtras()
-[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
-[50]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/MessageButton.html
-[51]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
-[52]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageHtml.html
-[53]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
-[54]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#in-app-message-customization
-[55]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#gifs-iams
-[59]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/#activity-lifecycle-callback-integration-api-14
-[60]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values-xlarge/styles.xml
-[65]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
-[66]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestInAppMessageRefresh--
-[67]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#requestDisplayInAppMessage--
-[68]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
-[69]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#ensureSubscribedToInAppMessageEvents-android.content.Context-
-[70]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/
-[71]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
-[72]: https://gist.github.com/robbiematthews/1d037e2c366e523b2dda5f2e053ea2a9
-[73]: {{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/push_notifications/silent_push_notifications/#silent-push-notifications
-[75]: {% image_buster /assets/img_archive/serverSentPush.png %}
-[76]: {% image_buster /assets/img_archive/kvpConfiguration.png %}
-[77]: {% image_buster /assets/img_archive/IAMeventTrigger.png %}
-[78]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#step-1-register-your-broadcastreceiver
-[79]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization/#font-customization
-[80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
-[81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
-[82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/troubleshooting.md b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/troubleshooting.md
new file mode 100644
index 0000000000..3947551aae
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/troubleshooting.md
@@ -0,0 +1,10 @@
+---
+nav_title: Troubleshooting
+page_order: 4
+search_rank: 5
+platform: Android
+---
+
+# Troubleshooting
+
+{% include archive/troubleshooting_iams.md platform="Android" %}
diff --git a/_docs/_developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration.md b/_docs/_developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration.md
index 0bfd3ce3f5..9857f7ddab 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration.md
@@ -13,7 +13,7 @@ Installing the Braze SDK will provide you with basic analytics functionality as
 Braze is in the process of sunsetting formal support for the Eclipse IDE as [Google is sunsetting support for the Eclipse Android Developer Tools Plugin][43]. If you need assistance with your Eclipse integration prior to migration, please [email Support]({{ site.baseurl }}/support_contact/) for assistance.
 
 ### Step 1: Integrate the Braze Library
-The Braze Android SDK can optionally be integrated without UI components. However, In-App Messaging, the News Feed, and Feedback will be rendered inoperable unless you pass the custom data to a UI solely of your design. Additionally, push notifications will not work because our `BroadcastReceiver` that handles push is in the UI library. Please note that these UI elements are open source and [fully customizable][1]. We strongly recommend integration of these features. Please refer to the [Braze Academy][2] for the benefits of using the Braze News Feed, In-App Message, and Feedback UI.
+The Braze Android SDK can optionally be integrated without UI components. However, In-App Messaging, the News Feed, and Feedback will be rendered inoperable unless you pass the custom data to a UI solely of your design. Additionally, push notifications will not work because our `BroadcastReceiver` that handles push is in the UI library. Please note that these UI elements are open source and [fully customizable][1]. We strongly recommend integration of these features. Please refer to [Braze Docs][2] for the benefits of using the Braze News Feed, In-App Message, and Feedback UI.
 
 #### Basic Integration
 In order to access Braze's messaging features, you must integrate the UI library. Please see the following directions to integrate the UI library depending on your IDE:
@@ -22,23 +22,15 @@ In order to access Braze's messaging features, you must integrate the UI library
 
 ##### Add our repository
 
-In your top-level project `build.gradle`, add:
-
-```
-maven { url "https://appboy.github.io/appboy-android-sdk/sdk" }
-maven { url "https://maven.google.com" }
-```
-
-as repositories under `allprojects` -> `repositories`.
+In your top-level project `build.gradle`, add the following as repositories under `allprojects` -> `repositories`.
 
 For example:
 
-```
+```gradle
 allprojects {
   repositories {
-    jcenter()
+    google()
     maven { url "https://appboy.github.io/appboy-android-sdk/sdk" }
-    maven { url "https://maven.google.com" }
   }
 }
 ```
@@ -49,9 +41,13 @@ Alternatively, you may install the `android-sdk-ui` as an AAR file to your local
 
 ##### Add Braze dependency
 
-See the following example in our [Hello Braze example project][45]:
+Add the `android-sdk-ui` dependency to your app's `build.gradle`. For example:
 
-<script src="https://gist-it.appspot.com/https://github.com/Appboy/appboy-android-sdk/blob/master/hello-appboy/build.gradle?slice=1:5&footer=minimal"></script>
+```gradle
+dependencies {
+  implementation "com.appboy:android-sdk-ui:+"
+}
+```
 
 The below example shows where to place the dependency line in your `build.gradle`. Note that the version used in the example below uses an old version. Please visit [Braze Android SDK Releases][60] for the most up to date version of the Braze Android SDK.
 
@@ -132,22 +128,23 @@ The second argument instructs the listener to handle `registerInAppMessageManage
 
 See the [javadoc][63] for more information. Please note that any non-standard manual session integration is not fully supported.
 
-### Step 5: Optional Custom Endpoint Setup
-
-If you have been set up with a custom endpoint your Customer Success Manager will advise you of the correct address. To update the default endpoint in your integration of the Braze SDKs please add the following code:
+### Step 5: Custom Endpoint Setup {#step-5-optional-custom-endpoint-setup}
 
-**Android**
+Your Braze representative should have already advised you of the [correct endpoint]({{ site.baseurl }}/user_guide/administrative/access_braze/sdk_endpoints/).
 
-Add the following code to your `appboy.xml`:
+To update the default endpoint in your integration of the Braze SDKs please add the following code to your `appboy.xml`:
 
 ```xml
 <string translatable="false" name="com_appboy_custom_endpoint">YOUR_CUSTOM_ENDPOINT_OR_CLUSTER</string>
 ```
 
->  SDK Endpoint configuration via `appboy.xml` is available starting with Braze Android SDK v2.1.1.
+The SDK Endpoint configuration via `appboy.xml` is available starting with __Braze Android SDK v2.1.1__.
 
 ### SDK Integration Complete
-Braze should now be collecting data from your application and your basic integration should be complete. Please see the following sections in order to enable custom event tracking, push messaging, the news-feed and the complete suite of Braze features.
+
+Braze will now be able to collect [specified data from your application]({{ site.baseurl }}/user_guide/data_and_analytics/user_data_collection/overview/) and your basic integration should be complete.
+
+Please see the following sections in order to enable [custom event tracking](/developer_guide/platform_integration_guides/android/analytics/tracking_custom_events/#tracking-custom-events), [push messaging](/developer_guide/platform_integration_guides/android/push_notifications/integration/), the [news feed](/developer_guide/platform_integration_guides/android/news_feed/overview/) and the [complete suite](/developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration/) of Braze features.
 
 [1]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/customization/#news-feed-customization
 [2]: {{ site.baseurl }}/user_guide/introduction/
diff --git a/_docs/_developer_guide/platform_integration_guides/android/news_feed/categories.md b/_docs/_developer_guide/platform_integration_guides/android/news_feed/categories.md
index 1894aedcb6..4732b21a08 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/news_feed/categories.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/news_feed/categories.md
@@ -7,7 +7,7 @@ platform: Android
 
 # Defining a News Feed Category
 
-Instances of the Braze News Feed can be configured to only receive cards from a certain “category”. This allows for effective integration of multiple News Feed streams within a single application. For more information on this feature see [Braze Academy][14]
+Instances of the Braze News Feed can be configured to only receive cards from a certain “category”. This allows for effective integration of multiple News Feed streams within a single application. For more information on this feature see more in our [News Feed best practices][14]
 
 News Feed Categories can be defined by calling the following methods as you load the News Feed:
 
diff --git a/_docs/_developer_guide/platform_integration_guides/android/push_notifications/html_rendered_push.md b/_docs/_developer_guide/platform_integration_guides/android/push_notifications/html_rendered_push.md
new file mode 100644
index 0000000000..0ab33e44f9
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/android/push_notifications/html_rendered_push.md
@@ -0,0 +1,59 @@
+---
+nav_title: HTML Push Notifications
+platform: Android
+page_order: 6
+search_rank: 5
+---
+## HTML Push Notifications
+
+In Braze SDK version 3.1.1, HTML can be sent to a device to render multicolor text in push notifications.
+
+![Multicolor push example][1]
+
+The above example is rendered with the following HTML:
+
+```html
+<p><span style="color: #99cc00;">M</span>u<span style="color: #008080;">lti</span>Colo<span style="color: #ff6600;">r</span> <span style="color: #000080;">P</span><span style="color: #00ccff;">u</span><span style="color: #ff0000;">s</span><span style="color: #808080;">h</span></p>
+```
+
+```html
+<p><em>test</em> <span style="text-decoration: underline; background-color: #ff6600;"><strong>message</strong></span></p>
+```
+
+> Android OS limits what HTML elements/tags are valid in push notifications. For example, `marquee` is not allowed.
+
+### Implementation
+
+In your `appboy.xml`:
+
+```xml
+<bool translatable="false" name="com_appboy_push_notification_html_rendering_enabled">true</bool>
+```
+
+Or in your [AppboyConfig][2]:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+AppboyConfig appboyConfig = new AppboyConfig.Builder()
+  .setPushHtmlRenderingEnabled(true)
+  .build();
+Appboy.configure(this, appboyConfig);
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+val appboyConfig = AppboyConfig.Builder()
+    .setPushHtmlRenderingEnabled(true)
+    .build()
+Appboy.configure(this, appboyConfig)
+```
+
+{% endtab %}
+{% endtabs %}
+
+[1]: {% image_buster /assets/img/multicolor_android_push.png %}
+[2]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/runtime_configuration/#runtime-configuration
diff --git a/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration.md b/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration.md
index 3f5e5d1573..583ea28a72 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration.md
@@ -12,7 +12,7 @@ Sample push notification:
 
 ![Sample Push][27]
 
-Check out [Braze Academy][7] for additional best practices.
+Check out [Braze Docs][7] for additional best practices.
 
 Braze sends push notifications to Android devices using [Firebase Cloud Messaging (FCM)][45].
 
@@ -22,17 +22,13 @@ For devices without Google services installed, Braze offers the option to send p
 
 ## Registering for Push
 
-Use Firebase to register for push.
+Use [Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/) (FCM) to register for push.
 
 > Though you could previously use GCM, Google has announced that they will remove support for GCM as soon as April 11, 2019 and automatic GCM registration is unavailable through the Braze SDK. If your app is currently supporting GCM, we advise that you speak to your development teams about transitioning to [Firebase from GCM](https://developers.google.com/cloud-messaging/android/android-migrate-fcm) as soon as possible.
 
 
 ### Firebase Integration
 
-We recommend using [Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/) (FCM) for push.
-
-Apps already using any of the Firebase SDKs must use the Firebase Messaging SDK to receive Braze pushes. This is because Firebase is not guaranteed to be compatible with GCM in all versions of Google Play Services.
-
 For a full sample of using Firebase with the Braze Android SDK, see our [Firebase Push sample app](https://github.com/Appboy/appboy-android-sdk/tree/master/samples/firebase-push).
 
 #### Step 1: Enable Firebase
@@ -42,16 +38,15 @@ To get started, follow the instructions at [Add Firebase to Your Android Project
 Next, add the Firebase Messaging dependency to your module's `build.gradle`:
 
 ```gradle
-compile "com.google.firebase:firebase-messaging:<YOUR_PLAY_SERVICES_VERSION>"
+implementation "com.google.firebase:firebase-core:${FIREBASE_CORE_VERSION}"
+implementation "com.google.firebase:firebase-messaging:${FIREBASE_PUSH_MESSAGING_VERSION}"
 ```
 
-> Firebase Messaging is the only Firebase dependency that Braze requires for push messaging.
-
 #### Step 2: Configure Token Registration
 
-Braze push notifications won't work until a Firebase Cloud Messaging token is registered. Firebase tokens can either be registered by the Braze SDK automatically (recommended) or manually registered. Tokens can be manually registered using the [`Appboy.registerAppboyPushMessages()`][35] method either directly or using a Firebase Instance ID Service.
+Braze push notifications won't work until a Firebase Cloud Messaging token is registered. Firebase tokens can either be registered by the Braze SDK automatically (recommended) or manually registered. Tokens can be manually registered using the [`Appboy.registerAppboyPushMessages()`][35] method.
 
-> Make sure to use your [project number][11], not the project ID. The project number is also known as the Firebase sender ID.
+> Make sure to use your Firebase Sender ID. This is a unique numerical value created when you create your Firebase project, available in the Cloud Messaging tab of the Firebase console Settings pane. The sender ID is used to identify each sender that can send messages to the client app.
 
 ##### Option 1: Automatic Registration
 
@@ -93,7 +88,7 @@ Appboy.configure(this, appboyConfig)
 
 If using a Firebase automatic registration, you can skip the manual options below.
 
-##### Option 2: Manual Application onCreate() Registration
+##### Option 2: Manual Registration
 
 We recommended you call [`Appboy.registerAppboyPushMessages()`][35] from within your application [`onCreate()`][67] method to ensure that push tokens are reliably delivered to Braze.
 
@@ -189,28 +184,72 @@ If you're not familiar with the location of your Firebase Server Key and Sender
 
 After completing this section, you should be able to receive and display push notifications sent by Braze.
 
-### Step 1: Register Braze FCM Receiver
+### Step 1: Register Braze Firebase Messaging Service
+Braze includes a service to handle push receipt and open intents. Our `AppboyFirebaseMessagingService` class will need to be registered in your `AndroidManifest.xml`.
 
-Braze includes a `FcmReceiver` to handle push receipt and open intents.  Our `FcmReceiver` class will need to be registered in your `AndroidManifest.xml`.
+```xml
+<service android:name="com.appboy.AppboyFirebaseMessagingService">
+  <intent-filter>
+    <action android:name="com.google.firebase.MESSAGING_EVENT" />
+  </intent-filter>
+</service>
+```
 
-- Add `AppboyFcmReceiver` to your `AndroidManifest.xml`. The category should be set to your [application package name][13]:
+Braze's notification code also uses `AppboyFirebaseMessagingService` to handle open and click action tracking. This service must be registered in the `AndroidManifest.xml` in order for that to function correctly. Also, keep in mind that Braze prefixes notifications from our system with a unique key to ensure we only render notifications sent from Braze's systems. You may register additional services separately in order to render notifications sent from other FCM services.
 
-  ```xml
-  <receiver android:name="com.appboy.AppboyFcmReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
-   <intent-filter>
-     <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-     <category android:name="YOUR-APPLICATION-PACKAGE-NAME" />
-   </intent-filter>
-  </receiver>
-  ```
+{% alert important %}
+If you already have a Firebase Messaging Service registered, do not complete this step. Instead, proceed to [Using Your Own Firebase Messaging Service](#using-your-own-firebase-messaging-service) and complete the steps listed there. 
+{% endalert %}
+
+##### Using Your Own Firebase Messaging Service
+
+If you already have a Firebase Messaging Service registered, you can pass [`RemoteMessage`][75] objects to Braze via [AppboyFirebaseMessagingService.handleBrazeRemoteMessage()][74]. This method will only display a notification if the [`RemoteMessage`][75] object originated from Braze and will safely ignore if not.
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+public class MyFirebaseMessagingService extends FirebaseMessagingService {
+  @Override
+  public void onMessageReceived(RemoteMessage remoteMessage) {
+    super.onMessageReceived(remoteMessage);
+    if (AppboyFirebaseMessagingService.handleBrazeRemoteMessage(this, remoteMessage)) {
+      // This Remote Message originated from Braze and a push notification was displayed.
+      // No further action is needed.
+    } else {
+      // This Remote Message did not originate from Braze.
+      // No action was taken and you can safely pass this Remote Message to other handlers.
+    }
+  }
+}
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+class MyFirebaseMessagingService : FirebaseMessagingService() {
+  override fun onMessageReceived(remoteMessage: RemoteMessage?) {
+    super.onMessageReceived(remoteMessage)
+    if (AppboyFirebaseMessagingService.handleBrazeRemoteMessage(this, remoteMessage)) {
+      // This Remote Message originated from Braze and a push notification was displayed.
+      // No further action is needed.
+    } else {
+      // This Remote Message did not originate from Braze.
+      // No action was taken and you can safely pass this Remote Message to other handlers.
+    }
+  }
+}
+```
 
-Braze's notification code also uses `AppboyFcmReceiver` to handle open and click action tracking. This receiver must be registered in the `AndroidManifest.xml` in order for that to function correctly. Also, keep in mind that Braze prefixes notifications from our system with a unique key and ensures that our broadcast receivers only render notifications sent from Braze's systems. You may register additional receivers separately in order to render notifications sent from other FCM services.
+{% endtab %}
+{% endtabs %}
 
-**Note** Before Braze Android SDK `2.7.0`, `AppboyFcmReceiver` is known as `AppboyGcmReceiver`. Their functionality is equivalent and integration instructions remain the same, however, all references to `AppboyFcmReceiver` in your `AndroidManifest.xml` and code will need to be replaced by references to `AppboyGcmReceiver`.
+> Before Braze SDK 3.1.1, `AppboyFcmReceiver` was used to handle FCM push. The `AppboyFcmReceiver` class should be removed from your manifest and replaced with the above integration.
 
 **Implementation Example**
 
-- See [`AndroidManifest.xml`][10] in the Droidboy sample app.
+- See [`AndroidManifest.xml`][70] in the Firebase Push sample app.
 
 ### Step 2: Configure Notification Icons
 
@@ -251,7 +290,7 @@ The icons pictured below are examples of properly designed icons:
 
 To enable Braze to automatically open your app and any deep links when a push notification is clicked, set `com_appboy_handle_push_deep_links_automatically` to `true` in your `appboy.xml`:
 
-```
+```xml
 <bool name="com_appboy_handle_push_deep_links_automatically">true</bool>
 ```
 
@@ -336,9 +375,9 @@ Back stack configuration is only available on SDK 2.1.4 and above.
 
 Braze SDKs 2.1.0 and above support [Android O Notification Channels][62]. In the case that a Braze notification does not contain the ID for a notification channel or that a Braze notification contains an invalid channel ID, Braze will display the notification with the default notification channel defined in the SDK. Braze users make use of [Android Notification Channels][61] within the platform to group notifications.
 
-To set the user facing name of the default Braze notification channel, please use `AppboyConfig.setDefaultNotificationChannelName().`
+To set the user facing name of the default Braze notification channel, please use [`AppboyConfig.setDefaultNotificationChannelName()`][72].
 
-To set the user facing description of the default Braze notification channel, please use `AppboyConfig.setDefaultNotificationChannelDescription()`.
+To set the user facing description of the default Braze notification channel, please use [`AppboyConfig.setDefaultNotificationChannelDescription()`][73].
 
 If you are an existing customer who is transitioning to Android O, you should ensure that any API campaigns with the [Android Push Object][63] parameter are updated to include the `notification_channel` field. If this field is not specified, Braze will send the notification payload with the [dashboard fallback][64] channel ID.
 
@@ -366,7 +405,7 @@ For issues related to push display, see our [Troubleshooting Guide][57].
 
 #### Testing Analytics
 
-At this point you should also have analytics logging for push notification opens.  To test this, see our [Academy Page][56] on creating a push campaign.  Clicking on the notification when it arrives should result in the `Direct Opens` on your campaign results page to increase by 1.
+At this point you should also have analytics logging for push notification opens.  To test this, see our [Docs][56] on creating a push campaign.  Clicking on the notification when it arrives should result in the `Direct Opens` on your campaign results page to increase by 1.
 
 For issues related to push analytics, see our [Troubleshooting Guide][57].
 
@@ -443,7 +482,7 @@ Braze broadcasts custom intents when push notifications are received, opened, or
 
 #### Step 1: Register your BroadcastReceiver
 
-Register your custom `BroadcastReceiver` to listen for Braze push opened and received intents in your [`AndroidManifest.xml`][10].
+Register your custom `BroadcastReceiver` to listen for Braze push opened and received intents in your [`AndroidManifest.xml`][71].
 
 ```xml
 <receiver android:name="YOUR-BROADCASTRECEIVER-NAME" android:exported="false" >
@@ -558,3 +597,9 @@ val myExtra = extras.getString("my_key")
 [67]: https://developer.android.com/reference/android/app/Application.html#onCreate()
 [68]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/runtime_configuration/#runtime-configuration
 [69]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#firebase-integration
+[70]: https://github.com/Appboy/appboy-android-sdk/blob/master/samples/firebase-push/src/main/AndroidManifest.xml "AndroidManifest.xml"
+[71]: https://github.com/Appboy/appboy-android-sdk/blob/master/samples/custom-broadcast/src/main/AndroidManifest.xml "AndroidManifest.xml"
+[72]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/configuration/AppboyConfig.Builder.html#setDefaultNotificationChannelName-java.lang.String-
+[73]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/configuration/AppboyConfig.Builder.html#setDefaultNotificationChannelDescription-java.lang.String-
+[74]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/AppboyFirebaseMessagingService.html#handleBrazeRemoteMessage-android.content.Context-RemoteMessage-
+[75]: https://firebase.google.com/docs/reference/android/com/google/firebase/messaging/RemoteMessage
diff --git a/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration_baidu.md b/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration_baidu.md
index 3f5712643c..dacd42f2d4 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration_baidu.md
+++ b/_docs/_developer_guide/platform_integration_guides/android/push_notifications/integration_baidu.md
@@ -1,7 +1,7 @@
 ---
 nav_title: Baidu Integration
 platform: Android
-page_order: 0
+page_order: 1
 search_rank: 5
 ---
 ## Baidu Integration
diff --git a/_docs/_developer_guide/platform_integration_guides/cordova/android_and_fireos/initial_sdk_setup.md b/_docs/_developer_guide/platform_integration_guides/cordova/android_and_fireos/initial_sdk_setup.md
index 488e8f4509..9c79a7b743 100644
--- a/_docs/_developer_guide/platform_integration_guides/cordova/android_and_fireos/initial_sdk_setup.md
+++ b/_docs/_developer_guide/platform_integration_guides/cordova/android_and_fireos/initial_sdk_setup.md
@@ -6,9 +6,17 @@ page_order: 0
 ---
 # Initial SDK Setup
 
-Download the SDK from [github][1] and run `cordova plugin add path_to_repo/appboy-cordova-sdk` from the root your project.
+Download the SDK from [Github][1] and run the following from the root your project:
 
-Alternatively, if you are running Cordova 6 or earlier, you could install directly from github, like `cordova plugin add https://github.com/appboy/appboy-cordova-sdk#master`.
+```
+cordova plugin add path_to_repo/appboy-cordova-sdk
+```
+
+Alternatively, if you are running Cordova 6 or later, you could install directly from Github:
+
+```
+cordova plugin add https://github.com/appboy/appboy-cordova-sdk#master
+```
 
 ### Configure the plugin
 
diff --git a/_docs/_developer_guide/platform_integration_guides/cordova/ios/initial_sdk_setup.md b/_docs/_developer_guide/platform_integration_guides/cordova/ios/initial_sdk_setup.md
index 152aaaf3eb..881a8538f0 100644
--- a/_docs/_developer_guide/platform_integration_guides/cordova/ios/initial_sdk_setup.md
+++ b/_docs/_developer_guide/platform_integration_guides/cordova/ios/initial_sdk_setup.md
@@ -8,13 +8,23 @@ page_order: 0
 
 Installing the Braze SDK will provide you with analytics functionality, as well as push and in-app messages.
 
-{{ site.data.alerts.update }}  As of SDK version 2.1.0, use of the iOS SDK requires XCode 8 or above.{{ site.data.alerts.end }}
+{% alert update %}
+As of SDK version 2.1.0, use of the iOS SDK requires XCode 8 or above.
+{% endalert %}
 
 ### Step 1: Get the SDK
 
-Download the SDK from [github][1] and run `cordova plugin add path_to_repo/appboy-cordova-sdk/` from the root your project.
+Download the SDK from [Github][1] and run the following from the root your project:
 
-Alternatively, if you are running Cordova 6 or earlier, you could install directly from github, like `cordova plugin add https://github.com/appboy/appboy-cordova-sdk#master`.
+```
+cordova plugin add path_to_repo/appboy-cordova-sdk/
+```
+
+Alternatively, if you are running Cordova 6 or later, you could install directly from Github:
+
+```
+cordova plugin add https://github.com/appboy/appboy-cordova-sdk#master
+```
 
 ### Configure the plugin
 
@@ -29,7 +39,7 @@ In your config.xml, add a `preference` element under the iOS `platform` element
 
 Set up your applications to have the appropriate certificates for push, via the [iOS push documentation][2].
 
-#### Removing automatic push setup (iOS)
+#### Removing Automatic Push Setup (iOS)
 
 If you want to turn off iOS automatic push registration, add the preference `com.appboy.ios_disable_automatic_push_registration` with a value of `true`.
 
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences.md b/_docs/_developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences.md
index ebccda9e35..9ac8e383c0 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences.md
@@ -7,7 +7,7 @@ search_rank: 4
 
 ## Locations & Geofences
 
-Geofences are only available in select Braze packages. For access please create a support ticket or speak with your Braze Customer Success Manager. Learn more in the [Braze Academy]({{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences/#locations--geofences).
+Geofences are only available in select Braze packages. For access please create a support ticket or speak with your Braze Customer Success Manager. Learn more in [Braze Docs]({{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences/#locations--geofences).
 
 To support geofences for Android:
 
@@ -48,6 +48,15 @@ Add the Braze boot receiver to the `application` element of your `AndroidManifes
 </receiver>
 ```
 
+{% alert note %}
+If you are using a version of the Android SDK less than `2.3.0`, the following manifest
+declaration is also required:
+
+```
+<service android:name="com.appboy.services.AppboyGeofenceService"/>
+```
+{% endalert %}
+
 ### Step 3: Obtain Location Permissions from the End User
 
 For Android M and higher versions, you must request location permissions from the end user before gathering location information or registering geofences.
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/location_tracking.md b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/location_tracking.md
index 1bc65f03b8..7aca03f524 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/location_tracking.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/location_tracking.md
@@ -39,5 +39,5 @@ See [here][3] for an implementation example of the above in our Droidboy sample
 
 [1]: http://developer.android.com/guide/topics/location/strategies.html
 [2]: https://developer.android.com/training/permissions/index.html
-[3]: https://github.com/Appboy/android-sdk/blob/18ea58f58f84018022b107d42a648f638b137fca/droidboy/src/main/java/com/appboy/sample/PreferencesActivity.java#L73
+[3]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/PreferencesActivity.java#L129
 [4]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/AppboyUser.html#setLastKnownLocation-double-double-java.lang.Double-java.lang.Double-
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_custom_attributes.md b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_custom_attributes.md
index 196c614471..5f91e98efb 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_custom_attributes.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_custom_attributes.md
@@ -168,7 +168,7 @@ To set up a subscription for your users (either email or push), call the functio
 | `SUBSCRIBED` | Subscribed, but not explicitly opted in |
 | `UNSUBSCRIBED` | Unsubscribed and/or explicitly opted out |
 
->  No explicit opt-in is required by Android to send users push notifications. When a user is registered for push, they are set to `SUBSCRIBED` rather than `OPTED_IN` by default. For more information on implementing subscriptions and explicit opt-ins, visit the topic on [Braze Academy][10].
+>  No explicit opt-in is required by Android to send users push notifications. When a user is registered for push, they are set to `SUBSCRIBED` rather than `OPTED_IN` by default. For more information on implementing subscriptions and explicit opt-ins, visit the topic on [Braze Docs][10].
 
 #### Sample Code
 
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_user_ids.md b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_user_ids.md
index 447e370159..72879e7413 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_user_ids.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/setting_user_ids.md
@@ -8,7 +8,7 @@ search_rank: 4
 
 User IDs should be set for each of your users. These should be unchanging and accessible when a user opens the app. A database ID or a hashed email address/username is usually a good reference to use. We __strongly recommend__ providing this identifier as it will allow you to:
 
-- Track your users across devices and platforms, improving the quality of your behaviorial and demographic data.
+- Track your users across devices and platforms, improving the quality of your behavioral and demographic data.
 - Import data about your users using our [User Data API][1].
 - Target specific users with our [Messaging API][2] for both general and transactional messages.
 
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/uninstall_tracking.md b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/uninstall_tracking.md
index 1822b1f98d..af0cdbcdca 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/analytics/uninstall_tracking.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/analytics/uninstall_tracking.md
@@ -6,6 +6,6 @@ search_rank: 4
 ---
 ## Uninstall Tracking
 
-Uninstall Tracking utilizes Firebase Cloud Messaging's "dry run" feature to detect uninstalled devices without actually sending a push notification to the device. As such, there is no SDK or device-side work necessary for Android and FireOS. For more information, see our [Uninstall Tracking][6] page on Braze Academy.
+Uninstall Tracking utilizes Firebase Cloud Messaging's "dry run" feature to detect uninstalled devices without actually sending a push notification to the device. As such, there is no SDK or device-side work necessary for Android and FireOS. For more information, see our [Uninstall Tracking][6] page on Braze Docs.
 
 [6]: {{ site.baseurl }}/user_guide/data_and_analytics/tracking/uninstall_tracking/#uninstall-tracking
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging.md b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging.md
index d8b9b15259..733c313d9e 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging.md
@@ -4,9 +4,10 @@ platform: FireOS
 page_order: 2
 search_rank: 4
 ---
+
 # In-App Messaging
 
-In-App Messages are great for creating unobtrusive calls to action, notifying people of new content in the News Feed and driving them toward it or communicating with users who have push turned off. They are also effective for other content that isn't time-sensitive enough to warrant a push notification, or permanent enough to warrant a News Feed item. You can find a detailed explanation of in-app message behavior in [Braze Academy][4].
+In-App Messages are great for creating unobtrusive calls to action, notifying people of new content in the News Feed and driving them toward it or communicating with users who have push turned off. They are also effective for other content that isn't time-sensitive enough to warrant a push notification, or permanent enough to warrant a News Feed item. You can find a detailed explanation of in-app message behavior in [Braze Docs][4].
 
 ## Integration {#in-app-messaging-integration}
 
@@ -174,7 +175,7 @@ Create a class that implements [`IInAppMessageManagerListener`][21]
 
 The callbacks in your `IInAppMessageManagerListener` will be called at various points in the in-app message lifecycle.
 
-For example, if you set a custom manager listener, when an in-app message is received from Braze, the `beforeInAppMessageDisplayed()` method will be called. If this method returns true, that signals to `AppboyInAppMessageManager` that the in-app message will be handled by the host app and that it should not be displayed by Braze.  If false is returned, the `AppboyInAppMessageManager` attempts to display the in-app message.  This method should be used if you choose to display the in-app message in a customized manner.
+For example, if you set a custom manager listener, when an in-app message is received from Braze, the `beforeInAppMessageDisplayed()` method will be called. If your implementation of this method returns [`InAppMessageOperation.DISCARD`][83], that signals to Braze that the in-app message will be handled by the host app and should not be displayed by Braze. If `InAppMessageOperation.DISPLAY_NOW` is returned, Braze will attempt to display the in-app message. This method should be used if you choose to display the in-app message in a customized manner.
 
 `IInAppMessageManagerListener` also includes delegate methods for clicks on the message itself or one of the buttons.  A common use case would be intercepting a message when a button or message is clicked for further processing.
 
@@ -305,7 +306,7 @@ For further details on custom handling push receipts, opens, and key-value pairs
 
 ### Step 3: Create a Push Campaign
 
-Create a silent push campaign which is triggered via the server sent event. For details on how to create a silent push campaign please review this section of our [Academy][73].
+Create a silent push campaign which is triggered via the server sent event. You can learn how to to this with our page on [how to create a silent push campaign][73].
 
 ![serverEventTrigger][75]
 
@@ -409,3 +410,4 @@ Starting in Braze Android SDK version 2.0.1, Youtube and other HTML5 content can
 [80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
 [81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
 [82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/customization.md b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/customization.md
new file mode 100644
index 0000000000..8568f92530
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/customization.md
@@ -0,0 +1,269 @@
+---
+nav_title: Customization
+platform: FireOS
+page_order: 2
+search_rank: 4
+---
+## Customization {#in-app-message-customization}
+All of Braze’s in-app message types are highly customizable across messages, images, [Font Awesome][15]  icons, click actions, analytics, editable styling, custom display options, and custom delivery options. Multiple options can be configured on a per in-app message basis from [within the dashboard]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/). Braze additionally provides multiple levels of advanced customization to satisfy a variety of use cases and needs.
+
+### Key-Value Pair Extras
+
+In-app message objects may carry key-value pairs as `extras`. They are specified on the dashboard under "Advanced Settings" when creating an in-app message campaign. These can be used to send data down along with an in-app message for further handling by the application.
+
+Call the following when you get an in-app message object to retrieve its extras:
+
+```java
+Map<String, String> getExtras()
+```
+
+See the [Javadoc][44] for more information.
+
+### Custom Styling
+
+Braze UI elements come with a default look and feel that matches the Android standard UI guidelines and provides a seamless experience. You can see these default styles in the Braze SDK's [`styles.xml`][6] file.
+
+```xml
+  <style name="Appboy"/>
+    <!-- In-app Message -->
+  <style name="Appboy.InAppMessage">
+  </style>
+  <style name="Appboy.InAppMessage.Header">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:padding">0.0dp</item>
+    <item name="android:background">@android:color/transparent</item>
+    <item name="android:textColor">@color/com_appboy_inappmessage_header_text_light</item>
+    <item name="android:textSize">19.0sp</item>
+    <item name="android:layout_gravity">center</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+```
+
+If you would prefer, you can override these styles to create a look and feel that better suits your app.
+
+To override a style, copy it in its entirety to the `styles.xml` file in your own project and make modifications. The whole style must be copied over to your local `styles.xml` file in order for all attributes to be correctly set. Please note that these custom styles are for changes to individual UI elements, not wholesale changes to layouts. Layout-level changes need to be handled with custom views.
+
+#### Using Custom Styling to Set a Custom Font
+
+Braze allows for setting a custom font using the [font family guide][79]. To use it, override the style for message text, headers, and/or button text and use the `fontFamily` attribute to instruct Braze to use your custom font family.
+
+For example, to update the font on your in-app message button text, override the `Appboy.InAppMessage.Button` style and reference your custom font family. The attribute value should point to a font family in your `res/font` directory.
+
+Here is a truncated example with a custom font family, `my_custom_font_family`, referenced on the last line:
+
+```
+  <style name="Appboy.InAppMessage.Button">
+    <item name="android:layout_height">wrap_content</item>
+    ...
+    <item name="android:paddingBottom">15.0dp</item>
+    <item name="android:fontFamily">@font/my_custom_font_family</item>
+    <item name="fontFamily">@font/my_custom_font_family</item>
+  </style>
+```
+
+Aside from the `Appboy.InAppMessage.Button` style for button text, the style for message text is `Appboy.InAppMessage.Message` and the style for message headers is `Appboy.InAppMessage.Header`. If you want to use your custom font family across all possible in-app message text, you can set your font family on the `Appboy.InAppMessage` style, which is the parent style for all in-app messages.
+
+>  As with other custom styles, the entire style must be copied over to your local `styles.xml` file for all attributes to be correctly set.
+
+### Setting Custom Listeners
+
+Before customizing in-app messages with custom listeners, it's important to understand the [`AppboyInAppMessageManager`][34], which handles the majority of in-app message handling. As described in [Step 1][5], it must be registered for in-app messages to function appropriately.
+
+`AppboyInAppMessageManager` manages in-app message display on Android.  It contains helper class instances that help it manage the lifecycle and display of in-app messages. All of these classes have standard implementations and defining custom classes is completely optional. However, doing so can add another level of control over the display and behavior of in-app messages.  These customizable classes include:
+
+- [`IInAppMessageManagerListener`][21] - Implement to [custom manage in-app message display and behavior][19].
+- [`IInAppMessageViewFactory`][42] - Implement to [build custom in-app message views][12].
+- [`IInAppMessageAnimationFactory`][20] - Implement to [define custom in-app message animations][22].
+
+#### Setting a Custom Manager Listener
+
+The `AppboyInAppMessageManager` automatically handles the display and lifecycle of in-app messages.  If you require more control over the lifecycle of a message, setting a custom manager listener will enable you to recieve the in-app message object at various points in the in-app message lifecycle, allowing you to handle its display yourself, perform further processing, react to user behavior, process the object's [Extras][14], and much more.
+
+##### Step 1: Implement an In-App Message Manager Listener
+
+Create a class that implements [`IInAppMessageManagerListener`][21]
+
+The callbacks in your `IInAppMessageManagerListener` will be called at various points in the in-app message lifecycle.
+
+For example, if you set a custom manager listener, when an in-app message is received from Braze, the `beforeInAppMessageDisplayed()` method will be called. If your implementation of this method returns [`InAppMessageOperation.DISCARD`][83], that signals to Braze that the in-app message will be handled by the host app and should not be displayed by Braze. If `InAppMessageOperation.DISPLAY_NOW` is returned, Braze will attempt to display the in-app message. This method should be used if you choose to display the in-app message in a customized manner.
+
+`IInAppMessageManagerListener` also includes delegate methods for clicks on the message itself or one of the buttons.  A common use case would be intercepting a message when a button or message is clicked for further processing.
+
+- See [`CustomInAppMessageManagerListener.java`][36] in our Droidboy sample app for an implementation example.
+
+##### Step 2: Instruct Braze to use your In-App Message Manager Listener
+
+Once your `IInAppMessageManagerListener` is created, call `AppboyInAppMessageManager.setCustomInAppMessageManagerListener()` to instruct `AppboyInAppMessageManager`
+to use your custom `IInAppMessageManagerListener` instead of the default listener.
+
+>  We recommend setting your `IInAppMessageManagerListener` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom listener is set before any in-app message is displayed.
+
+See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for an example implementation.
+
+##### In-Depth: Altering In-App Messages Before Display
+
+When a new in-app message is received, and there is already an in-app message being displayed, the new message will be put onto the top of the stack and can be displayed at a later time.
+
+However, if there is no in-app message being displayed, the following delegate method in `IInAppMessageManagerListener` will be called:
+
+```java
+  @Override
+  public InAppMessageOperation beforeInAppMessageDisplayed(IInAppMessage inAppMessageBase) {
+    return InAppMessageOperation.DISPLAY_NOW;
+  }
+```
+
+The `InAppMessageOperation()` return value can be used to control when the message should be displayed. A suggested usage of this method would be to delay messages in certain parts of the app by returning `DISPLAY_LATER` when in-app messages would be distracting to the user's app experience.
+
+| `InAppMessageOperation` return value | Behavior |
+| -------------------------- | -------- |
+| `DISPLAY_NOW` | The message will be displayed |
+| `DISPLAY_LATER` | The message will be returned to the stack and displayed at the next available opportunity |
+| `DISCARD` | The message will be discarded |
+| `null` | The message will be ignored. This method should __NOT__ return `null` |
+
+See [`InAppMessageOperation.java`][45] for more details.
+
+>  If you choose to `DISCARD` the in-app message and replace it with your own in-app message view, you will need to manually log in-app message clicks and impressions.
+
+On Android, this is done by calling `logClick` and `logImpression` on in-app messages, and `logButtonClick` on immersive in-app messages.
+
+>  Once an in-app message has been placed on the stack, you can request for it to be retrieved and displayed at any time by calling [`AppboyInAppMessageManager.requestDisplayInAppMessage()`][67]. Calling this method requests Braze to display the next available in-app message from the stack.
+
+#### Setting a Custom View Factory
+
+Braze's suite of in-app messages types are versatile enough to cover the vast majority of custom use cases.  However, if you would like to fully define the visual appearance of your in-app messages instead of using a default type, Braze makes this possible via setting a custom view factory.
+
+##### Step 1: Implement an In-App Message View Factory
+
+Create a class that implements [`IInAppMessageViewFactory`][42]
+
+- See [`CustomInAppMessageViewFactory.java`][43] in our Droidboy sample app for an implementation example.
+
+##### Step 2: Instruct Braze to use your In-App Message View Factory
+
+Once your `IInAppMessageViewFactory` is created, call `AppboyInAppMessageManager.setCustomInAppMessageViewFactory()` to instruct `AppboyInAppMessageManager`
+to use your custom `IInAppMessageViewFactory` instead of the default view factory.
+
+>  We recommend setting your `IInAppMessageViewFactory` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom view factory is set before any in-app message is displayed.
+
+See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for an example implementation.
+
+##### In-Depth: Implementing a Braze View Interface
+
+Braze's `slideup` in-app message view implements [`IInAppMessageView`][25].  Braze's `full` and `modal` type message views implement [`IInAppMessageImmersiveView`][24].  Implementing one of these classes will allow Braze to add click listeners to your custom view where appropriate.  All Braze view classes extend Android's [View][18] class.
+
+Implementing `IInAppMessageView` allows you to define a certain portion of your custom view as clickable.  Implementing `IInAppMessageImmersiveView` allows you to define message button views and a close button view.
+
+- See [`CustomInAppMessageView.java`][26] in our Droidboy sample app for an implementation example.
+
+#### Setting a Custom Animation Factory
+
+In-app messages have preset animation behavior. `Slideup` type messages slide into the screen; `full` and `modal` messages fade in and out.  If you would like to define custom animation behaviors for your in-app messages, Braze makes this possible via setting a custom animation factory.
+
+##### Step 1: Implement an In-App Message Animation Factory
+
+Create a class that implements [`IInAppMessageAnimationFactory`][20]
+
+- See [`CustomInAppMessageAnimationFactory.java`][9] in our Droidboy sample app for an implementation example.
+
+##### Step 2: Instruct Braze to use your In-App Message View Factory
+
+Once your `IInAppMessageAnimationFactory` is created, call `AppboyInAppMessageManager.setCustomInAppMessageAnimationFactory()` to instruct `AppboyInAppMessageManager`
+to use your custom `IInAppMessageAnimationFactory` instead of the default animation factory.
+
+>  We recommend setting your `IInAppMessageAnimationFactory` in your [`Application.onCreate()`][82] before any other calls to Braze. This will ensure that the custom animation factory is set before any in-app message is displayed.
+
+See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for an example implementation.
+
+### Setting Fixed Orientation
+
+To set a fixed orientation for an in-app message, first [set a custom in-app message manager listener][19]. Then, call `setOrientation()` on the `IInAppMessage` object in the `beforeInAppMessageDisplayed()` delegate method.
+
+```java
+public InAppMessageOperation beforeInAppMessageDisplayed(IInAppMessage inAppMessage) {
+  // Set the orientation to portrait
+ inAppMessage.setOrientation(Orientation.PORTRAIT);
+ return InAppMessageOperation.DISPLAY_NOW;
+}
+```
+
+## Button Text Capitalization
+
+Android Material Design specifies that Button text should be upper case by default. Braze's in-app message buttons follow this convention as well.
+
+## Youtube in HTML in-app messages
+
+Starting in Braze Android SDK version 2.0.1, Youtube and other HTML5 content can play in HTML in-app messages. This requires hardware acceleration to be enabled in the Activity where the in-app message is being displayed, please see the [Android developer guide][71] for more details. Also that hardware acceleration is only available on API versions 11 and above.
+
+## GIFs {#gifs-IAMs}
+
+{% include archive/android/gifs.md channel="in-app messages" %}
+
+
+
+
+[1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
+[2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
+[3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
+[4]: {{ site.baseurl }}/help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
+[7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageImmersive.html
+[9]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageAnimationFactory.java
+[12]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-view-factory
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/#key-value-pairs
+[15]: http://fortawesome.github.io/Font-Awesome/
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#modal-in-app-messages
+[18]: http://developer.android.com/reference/android/view/View.html
+[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-manager-listener
+[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageAnimationFactory.java
+[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
+[22]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-animation-factory
+[23]: http://developer.android.com/reference/android/R.integer.html#config_shortAnimTime
+[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
+[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageView.java
+[26]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageView.java
+[27]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageBase.html
+[28]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageImmersiveBase.html
+[29]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessage.java
+[30]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
+[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
+[36]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[39]: https://developer.android.com/guide/topics/ui/dialogs.html
+[40]: {{ site.baseurl }}/docs/developer_guide/platform_integration_guides/android/in-app_messaging/#html-full-in-app-messages
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#full-in-app-messages
+[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
+[43]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageViewFactory.java
+[44]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html#getExtras()
+[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[50]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/MessageButton.html
+[51]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
+[52]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageHtml.html
+[53]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[54]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#in-app-message-customization
+[55]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#gifs-iams
+[59]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/#activity-lifecycle-callback-integration-api-14
+[60]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values-xlarge/styles.xml
+[65]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[66]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestInAppMessageRefresh--
+[67]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#requestDisplayInAppMessage--
+[68]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[69]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#ensureSubscribedToInAppMessageEvents-android.content.Context-
+[70]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/
+[71]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
+[72]: https://gist.github.com/robbiematthews/1d037e2c366e523b2dda5f2e053ea2a9
+[73]: {{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/push_notifications/silent_push_notifications/#silent-push-notifications
+[75]: {% image_buster /assets/img_archive/serverSentPush.png %}
+[76]: {% image_buster /assets/img_archive/kvpConfiguration.png %}
+[77]: {% image_buster /assets/img_archive/IAMeventTrigger.png %}
+[78]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#step-1-register-your-broadcastreceiver
+[79]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization/#font-customization
+[80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
+[81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
+[82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/in-app_message_delivery.md b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/in-app_message_delivery.md
new file mode 100644
index 0000000000..a513494edf
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/in-app_message_delivery.md
@@ -0,0 +1,166 @@
+---
+nav_title: In-App Message Delivery
+platform: FireOS
+page_order: 3
+search_rank: 4
+---
+
+# In-App Message Delivery
+
+## Trigger Types
+
+Our in-app message product allows you to trigger in-app message display as a result of several different event types: `Any Purchase`, `Specific Purchase`, `Session Start`, `Custom Event`, `Push Click`.  Furthermore, `Specific Purchase` and `Custom Event` triggers can contain robust property filters.
+
+{% alert important %}
+Triggered in-app messages only work with custom events logged through the SDK and not through the Rest APIs.  If you're working with Android, please check out how to log custom events [here]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_custom_events/#tracking-custom-events). If you're working with iOS, check out how to log custom events [here]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/tracking_custom_events/#tracking-custom-events).
+{% endalert %}
+
+## Delivery Semantics
+
+All in-app messages that a user is eligible for are delivered to the user's device on session start. For more information about the SDK's session start semantics, see our [session lifecycle documentation][86]. Upon delivery, the SDK will pre-fetch assets so that they are available immediately at trigger time, minimizing display latency.
+
+When a trigger event has more than one eligible in-app message associated with it, only the in-app message with the highest priority will be delivered.
+
+For in-app messages that display immediately on deliver (*i.e.*, session start, push click) there can be some latency due to assets not being prefetched.
+
+## Minimum Time Interval Between Triggers
+
+By default, we rate limit in-app messages to once every 30 seconds to ensure a quality user experience.
+
+To override this value, set `com_appboy_trigger_action_minimum_time_interval_seconds` in your `appboy.xml`. An example can be found in our sample application's [`appboy.xml`][87].
+
+# Server-side Event Triggering
+
+By default in-app messages are triggered by custom events logged by the SDK. If you would like to trigger in-app messages by server sent events you are also able to achieve this.
+
+To enable this feature, a silent push is sent to the device which allows a custom push receiver to log an SDK based event. This SDK event will subsequently trigger the user-facing in-app message.
+
+## Step 1: Register a Custom Broadcast Receiver to Log Custom Event
+
+Register your custom `BroadcastReceiver` to listen for a specific silent push within your AndroidManifest.xml. For more information on how to register a custom `BroadcastReceiver` please review [Braze's push documentation][78].
+
+## Step 2: Create your BroadcastReceiver
+
+Your receiver will handle the intent broadcast by the silent push and log an SDK event. Starting in SDK 2.0.0, events can be logged in the background without issue. All clients implementing this solution must be on SDK v2.0.0+.
+
+It will subclass `BroadcastReceiver` and override `onReceive()`. For a detailed example, please see our [EventBroadcastReceiver.java][72] in the linked gist.
+
+>  Two events will be logged for the in-app message to be delivered, one by the server and one from within your custom `BroadcastReceiver`. To ensure the same event is not duplicated, the event logged from within your `BroadcastReceiver` should be given a generic naming convention, for example "in-app message trigger event," and not the same name as the server sent event. If this is not done segmentation and user data may be affected by duplicate events being logged for a single user action.
+
+For further details on custom handling push receipts, opens, and key-value pairs please visit this section of our [Documentation][78].
+
+## Step 3: Create a Push Campaign
+
+Create a silent push campaign which is triggered via the server sent event. For details on how to create a silent push campaign please review this section of our [Docs][73].
+
+![serverEventTrigger][75]
+
+The push campaign must include key value pair extras which indicate that this push campaign is sent with the intention to log an SDK custom event. This event will be used to trigger the in-app message
+
+![kvpConfiguration][76]
+
+The [EventBroadcastReceiver.java][72] recognizes the key value pairs and logs the appropriate SDK custom event.
+
+Should you want to include any event properties to attach to your 'In-App Message Trigger' event, you can achieve this by passing these in the key value pairs of the push payload. In the example above the campaign name of the subsequent in-app message has been included. Your custom `BroadcastReceiver` can then pass the value as the parameter of the event property when logging the custom event.
+
+##  Step 4: Create an In-App Message Campaign
+
+Create your user visible in-app message campaign from within Braze’s dashboard. This campaign should have an Action Based delivery, and be triggered from the custom event logged from within the custom [EventBroadcastReceiver.java][72].
+
+In the example below the specific in-app message to be triggered has been configured by sending the event property as part of the initial silent push.
+
+![serverEventTrigger][77]
+
+>  If a server sent event is logged whilst the app is not in the foreground, the event will log but the in-app message will not be displayed. Should you want the event to be delayed until the application is in the foreground, a check must be included in your custom push receiver to dismiss or delay the event until the app has entered the foreground.
+
+## Local In-App Messages
+
+In-app messages can be created within the app and displayed locally in real-time.  All customization options available on the dashboard are also available locally.  This is particularly useful for displaying messages that you wish to trigger within the app in real-time.
+
+```java
+  // Initializes a new slideup type in-app message and specifies its message.
+  InAppMessageSlideup inAppMessage = new InAppMessageSlideup();
+  inAppMessage.setMessage("Welcome to Braze! This is a slideup in-app message.");
+```
+
+>  Do not display in-app messages when the soft keyboard is displayed on screen as rendering is undefined in this circumstance.
+
+### Manually Triggering In-App Message Display
+
+The following method will manually display your in-app message.
+
+```java
+  AppboyInAppMessageManager.getInstance().addInAppMessage(inAppMessage);
+```
+
+See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for example usage.
+
+[1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
+[2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
+[3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
+[4]: {{ site.baseurl }}/help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
+[7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageImmersive.html
+[9]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageAnimationFactory.java
+[12]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-view-factory
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/#key-value-pairs
+[15]: http://fortawesome.github.io/Font-Awesome/
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#modal-in-app-messages
+[18]: http://developer.android.com/reference/android/view/View.html
+[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-manager-listener
+[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageAnimationFactory.java
+[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
+[22]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-animation-factory
+[23]: http://developer.android.com/reference/android/R.integer.html#config_shortAnimTime
+[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
+[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageView.java
+[26]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageView.java
+[27]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageBase.html
+[28]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageImmersiveBase.html
+[29]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessage.java
+[30]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
+[33]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
+[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
+[36]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[39]: https://developer.android.com/guide/topics/ui/dialogs.html
+[40]: {{ site.baseurl }}/docs/developer_guide/platform_integration_guides/android/in-app_messaging/#html-full-in-app-messages
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#full-in-app-messages
+[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
+[43]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageViewFactory.java
+[44]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html#getExtras()
+[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[50]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/MessageButton.html
+[51]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
+[52]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageHtml.html
+[53]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[54]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#in-app-message-customization
+[55]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#gifs-iams
+[59]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/#activity-lifecycle-callback-integration-api-14
+[60]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values-xlarge/styles.xml
+[65]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[66]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestInAppMessageRefresh--
+[67]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#requestDisplayInAppMessage--
+[68]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[69]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#ensureSubscribedToInAppMessageEvents-android.content.Context-
+[70]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/
+[71]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
+[72]: https://gist.github.com/robbiematthews/1d037e2c366e523b2dda5f2e053ea2a9
+[73]: {{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/push_notifications/silent_push_notifications/#silent-push-notifications
+[75]: {% image_buster /assets/img_archive/serverSentPush.png %}
+[76]: {% image_buster /assets/img_archive/kvpConfiguration.png %}
+[77]: {% image_buster /assets/img_archive/IAMeventTrigger.png %}
+[78]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#step-1-register-your-broadcastreceiver
+[79]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization/#font-customization
+[80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
+[81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
+[82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[84]: {% image_buster /assets/img_archive/trigger-iam-composer.png %}
+[85]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#original-in-app-messages
+[86]: {{ site.baseurl }}/developer_guide/platform_integration_guides/{{ include.platform }}/analytics/tracking_sessions/#session-lifecycle
+[87]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values/appboy.xml
+[88]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_custom_events/#tracking-custom-events
+[89]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/tracking_custom_events/#tracking-custom-events
diff --git a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/in-app_message_types.md b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/integration.md
similarity index 67%
rename from _docs/_developer_guide/platform_integration_guides/android/in-app_messaging/in-app_message_types.md
rename to _docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/integration.md
index 476a5afd70..d103f69d64 100644
--- a/_docs/_developer_guide/platform_integration_guides/android/in-app_messaging/in-app_message_types.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/integration.md
@@ -1,82 +1,59 @@
 ---
-nav_title: In-App Message Types
-page_order: 2
-search_rank: 5
-platform: Android
+nav_title: Integration
+platform: FireOS
+page_order: 1
+search_rank: 4
 ---
+## Integration {#in-app-messaging-integration}
 
-# In-App Message Types
+### Step 1: Braze In-App Message Manager Registration
 
-Braze offers several default in-app message types, each customizable with messages, images, [Font Awesome][15] icons, click actions, analytics, editable styling and color schemes.  The currently available types are [`Slideup`][13], [`Modal`][17], [`Full`][41], and [`HTML Full`][40].  It is also possible to [define your own custom in-app message view][12].
+In-App Message display is managed by the [`AppboyInAppMessageManager`][34] class. Every activity in your app must be registered with the `AppboyInAppMessageManager` to allow it to add in-app message views to the view hierarchy. There are two ways to accomplish this:
 
-All in-app messages implement the [`IInAppMessage`][3] interface, which defines basic behavior and traits for all in-app messages.  [`InAppMessageBase`][27] is an abstract class that implements `IInAppMessage` and provides the foundational in-app message implementation.  All in-app message classes are subclasses of `InAppMessageBase`.
+#### Activity Lifecycle Callback Integration (Recommended)
 
-In addition, there is a subinterface of `IInAppMessage` called [`IInAppMessageImmersive`][8], which adds click action and analytics enabled [buttons][50], as well as header text and a close button.  [`InAppMessageImmersiveBase`][28] is an abstract class that implements `IInAppMessageImmersive` and provides the foundational `immersive` in-app message implementation.  `Modal` and `Full` in-app messages are subclasses of `InAppMessageImmersiveBase`.
+The [Activity Lifecycle Callback Integration][59] handles in-app message registration automatically, no extra integration is required. This is the recommended integration for handling in-app message registration.
 
-HTML Full in-app messages are [`InAppMessageHtmlFull`][51] instances, which implement [`IInAppMessageHtml`][52], another subclass of `IInAppMessage`.
+#### Manual In-App Message Registration
 
-{% include archive/in_app_message.md platform="Android" %}
+A manual in-app message registration requires 3 steps.
 
-## Local In-App Messages
+>  If you did the activity lifecycle integration, then you should *not* do a manual in-app message integration.
 
-In-app messages can be created within the app and displayed locally in real-time.  All customization options available on the dashboard are also available locally.  This is particularly useful for displaying messages that you wish to trigger within the app in real-time.
-
-{% tabs %}
-{% tab JAVA %}
+* In your [`Application.onCreate()`][82], [`ensureSubscribedToInAppMessageEvents()`][69] should be called.
 
 ```java
-// Initializes a new slideup type in-app message and specifies its message.
-InAppMessageSlideup inAppMessage = new InAppMessageSlideup();
-inAppMessage.setMessage("Welcome to Braze! This is a slideup in-app message.");
-```
-
-{% endtab %}
-{% tab KOTLIN %}
-
-```kotlin
-// Initializes a new slideup type in-app message and specifies its message.
-val inAppMessage = InAppMessageSlideup()
-inAppMessage.message = "Welcome to Braze! This is a slideup in-app message."
+AppboyInAppMessageManager.getInstance().ensureSubscribedToInAppMessageEvents(context);
 ```
 
-{% endtab %}
-{% endtabs %}
-
->  Do not display in-app messages when the soft keyboard is displayed on screen as rendering is undefined in this circumstance.
-
-### Manually Triggering In-App Message Display
-
-The following method will manually display your in-app message.
-
-{% tabs %}
-{% tab JAVA %}
+* In every activity where in-app messages can be shown, [`registerInAppMessageManager()`][80] should be called in that activity's `onResume()`.
 
 ```java
-AppboyInAppMessageManager.getInstance().addInAppMessage(inAppMessage);
+@Override
+public void onResume() {
+  super.onResume();
+  // Registers the AppboyInAppMessageManager for the current Activity. This Activity will now listen for
+  // in-app messages from Braze.
+  AppboyInAppMessageManager.getInstance().registerInAppMessageManager(activity);
+}
 ```
 
-{% endtab %}
-{% tab KOTLIN %}
+* In every activity where [`registerInAppMessageManager()`][80] was called, [`unregisterInAppMessageManager()`][81] should be called in that activity's `onPause()`.
 
-```kotlin
-AppboyInAppMessageManager.getInstance().addInAppMessage(inAppMessage)
+```java
+@Override
+public void onPause() {
+  super.onPause();
+  // Unregisters the AppboyInAppMessageManager for the current Activity.
+  AppboyInAppMessageManager.getInstance().unregisterInAppMessageManager(activity);
+}
 ```
 
-{% endtab %}
-{% endtabs %}
-
-See [`InAppMessageTesterFragment.java`][2] in the DroidBoy sample app for example usage.
-
-#### In-Depth: Defining Custom In-App Message Types
-
-Braze's `slideup` in-app message object extends [`InAppMessageBase`][27].  Braze's `full` and `modal` type messages extend [`InAppMessageImmersiveBase`][28].  Extending one of these classes gives you the option of adding custom functionality to your locally generated in-app messages.
-
-See [`CustomInAppMessage.java`][29] in the DroidBoy sample app for an example implementation.
 
 [1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
 [2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
 [3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
-[4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[4]: {{ site.baseurl }}/help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
 [5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
 [6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
 [7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
@@ -135,3 +112,4 @@ See [`CustomInAppMessage.java`][29] in the DroidBoy sample app for an example im
 [80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
 [81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
 [82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/overview.md b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/overview.md
new file mode 100644
index 0000000000..79873150d9
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/overview.md
@@ -0,0 +1,171 @@
+---
+nav_title: Overview
+platform: FireOS
+page_order: 0
+search_rank: 4
+---
+# In-App Messages
+
+__In-App Messages__ help you get content to your user without interrupting their day with a push notification. Customized and tailored in-app messages enhance the user experience and help your audience get the most value out of your app. With a variety of layouts and customization tools to choose from, in-app messages engage your users more than ever before.
+
+To see examples of in-app messages, check out our [Client Integration Gallery][83].
+
+{% comment %}
+Embed video on the right. Demos all of the topics mentioned on this page.
+{% endcomment %}
+
+{% alert note %}
+Braze has refreshed in-app messages! Though the creation process is very much the same, our in-app messages have a new, modern look and feel optimized for the best experiences for your customers and give you more options to personalize the experience. For more information on our most recent upgrades to in-app messages, check out our [Generation Comparison documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/generations/)!
+{% endalert %}
+
+[Create an in-app message]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/) now!
+
+## When to Use In-App Messages
+
+In-app messages are good for a lot of things. They can be used in web apps, Android apps, iOS apps, and more!
+
+In-app messages don't deliver outside of the user's app and won't intrude on their home screen, like push notifications do. In-app messages, by their nature, exist within your app and come with context and are almost never unwelcome! They're always delivered when the user is active within your app.
+
+### Great Use Cases
+
+- New App Features
+- App Management
+- Reviews
+- App Upgrades/Updates
+- Giveaways & Sweepstakes
+- Sales and Promotions
+- Product Sales
+- Encouraging and rewarding discovery
+- [Permission Requests/Push Priming][84]
+
+## In-App Message Types
+
+Braze offers several default in-app message types, each customizable with messages, images, [Font Awesome][15] icons, click actions, analytics, editable styling and color schemes.  The currently available types are `Slideup`, `Modal`, `Full`, and `HTML Full`.  It is also possible to [define your own custom in-app message view][12].
+
+All in-app messages implement the [`IInAppMessage`][3] interface, which defines basic behavior and traits for all in-app messages.  [`InAppMessageBase`][27] is an abstract class that implements `IInAppMessage` and provides the foundational in-app message implementation.  All in-app message classes are subclasses of `InAppMessageBase`.
+
+In addition, there is a subinterface of `IInAppMessage` called [`IInAppMessageImmersive`][8], which adds click action and analytics enabled [buttons][50], as well as header text and a close button.  [`InAppMessageImmersiveBase`][28] is an abstract class that implements `IInAppMessageImmersive` and provides the foundational `immersive` in-app message implementation.  `Modal` and `Full` in-app messages are subclasses of `InAppMessageImmersiveBase`.
+
+HTML Full in-app messages are [`InAppMessageHtmlFull`][51] instances, which implement [`IInAppMessageHtml`][52], another subclass of `IInAppMessage`.
+
+### Expected Behaviors by Message Types
+
+These are what each in-app message type will appear like for your users.
+
+{% tabs %}
+  {% tab Slideup %}
+  [`Slideup`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageSlideup.html) in-app messages are so-named because they "slide up" or "slide down" from the top or bottom of the screen.  They cover a small portion of the screen and provide an effective and non-intrusive messaging capability.
+
+  <br>
+
+  ![Slideup Behavior]({% image_buster /assets/img/slideup-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+{% endtab %}
+{% tab Modal %}
+[`Modal`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageModal.html) in-app messages appear in the center of the screen and are framed by a translucent panel. Useful for more critical messaging, they can be equipped with up to two click action and analytics enabled buttons.
+
+  <br>
+
+  ![Modal Behavior]({% image_buster /assets/img/modal-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+
+{% endtab %}
+{% tab Full Screen %}
+[`Full`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageFull.html) in-app messages are useful for maximizing the content and impact of your user communication.  The upper half of a `full` in-app message contains an image and the lower half displays text as well as up to two click action and analytics enabled buttons.
+
+![Full Example]({% image_buster /assets/img_archive/In-App_Full.png %})
+
+
+{% endtab %}
+{% tab Custom HTML %}
+[`HTML Full`](https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html) in-app messages are useful for creating fully customized user content. User-defined HTML Full in-app message content is displayed in a {% if include.platform == "iOS" %}`UIWebView`{% elsif include.platform == "Android" %}`WebView`{% endif %} and may optionally contain other rich content, such as images and fonts, allowing for full control over message appearance and functionality.
+
+<br>
+
+![Full-Screen Behavior]({% image_buster /assets/img/full-screen-behavior.gif %}){: style="border:0px;"}
+
+<br>
+
+Full in-app message content is displayed in a `UIWebView` and may optionally contain other rich content, such as images and fonts, allowing for full control over message appearance and functionality.
+
+{% alert important %}
+Please note that we currently do not support display of custom HTML in-app messages in an iFrame on the iOS and Android platforms.
+{% endalert %}
+
+{% endtab %}
+{% endtabs %}
+
+#### In-Depth: Defining Custom In-App Message Types
+
+Braze's `slideup` in-app message object extends [`InAppMessageBase`][27].  Braze's `full` and `modal` type messages extend [`InAppMessageImmersiveBase`][28].  Extending one of these classes gives you the option of adding custom functionality to your locally generated in-app messages.
+
+See [`CustomInAppMessage.java`][29] in the DroidBoy sample app for an example implementation.
+
+[1]: https://github.com/Appboy/appboy-android-sdk/tree/master/samples/manual-session-integration
+[2]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/InAppMessageTesterFragment.java
+[3]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html
+[4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[6]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/values/styles.xml
+[7]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageImmersive.html
+[9]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageAnimationFactory.java
+[12]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/customization/#setting-a-custom-view-factory
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[14]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/news_feed/#key-value-pairs
+[15]: http://fortawesome.github.io/Font-Awesome/
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#modal-in-app-messages
+[18]: http://developer.android.com/reference/android/view/View.html
+[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-manager-listener
+[20]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageAnimationFactory.java
+[21]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/listeners/IInAppMessageManagerListener.java
+[22]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#setting-a-custom-animation-factory
+[23]: http://developer.android.com/reference/android/R.integer.html#config_shortAnimTime
+[24]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageImmersiveView.java
+[25]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageView.java
+[26]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageView.java
+[27]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageBase.html
+[28]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageImmersiveBase.html
+[29]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessage.java
+[30]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
+[33]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
+[34]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/AppboyInAppMessageManager.java
+[36]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageManagerListener.java
+[39]: https://developer.android.com/guide/topics/ui/dialogs.html
+[40]: {{ site.baseurl }}/docs/developer_guide/platform_integration_guides/android/in-app_messaging/#html-full-in-app-messages
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#full-in-app-messages
+[42]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/IInAppMessageViewFactory.java
+[43]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomInAppMessageViewFactory.java
+[44]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessage.html#getExtras()
+[45]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/inappmessage/InAppMessageOperation.java
+[50]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/MessageButton.html
+[51]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
+[52]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/IInAppMessageHtml.html
+[53]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[54]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#in-app-message-customization
+[55]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/#gifs-iams
+[59]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/#activity-lifecycle-callback-integration-api-14
+[60]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values-xlarge/styles.xml
+[65]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[66]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestInAppMessageRefresh--
+[67]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#requestDisplayInAppMessage--
+[68]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/
+[69]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#ensureSubscribedToInAppMessageEvents-android.content.Context-
+[70]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/
+[71]: https://developer.android.com/guide/topics/graphics/hardware-accel.html#controlling
+[72]: https://gist.github.com/robbiematthews/1d037e2c366e523b2dda5f2e053ea2a9
+[73]: {{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/push_notifications/silent_push_notifications/#silent-push-notifications
+[75]: {% image_buster /assets/img_archive/serverSentPush.png %}
+[76]: {% image_buster /assets/img_archive/kvpConfiguration.png %}
+[77]: {% image_buster /assets/img_archive/IAMeventTrigger.png %}
+[78]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#step-1-register-your-broadcastreceiver
+[79]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization/#font-customization
+[80]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#registerInAppMessageManager-android.app.Activity-
+[81]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/ui/inappmessage/AppboyInAppMessageManager.html#unregisterInAppMessageManager-android.app.Activity-
+[82]: https://developer.android.com/reference/android/app/Application.html#onCreate()
+[83]: {{ site.baseurl }}/help/best_practices/client_integration_gallery/#client-integration-iam
+[84]: {{ site.baseurl }}/help/best_practices/push/creating_custom_opt-in_prompts/#creating-custom-opt-in-prompts
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/troubleshooting.md b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/troubleshooting.md
new file mode 100644
index 0000000000..1b7b8f62c7
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/in-app_messaging/troubleshooting.md
@@ -0,0 +1,11 @@
+---
+nav_title: Troubleshooting
+platform: FireOS
+page_order: 4
+search_rank: 4
+---
+{% include archive/troubleshooting_iams.md platform="FireOS" %}
+
+#### Android Dialogs
+
+Braze doesn't support displaying in-app messages in [Android Dialogs](https://developer.android.com/guide/topics/ui/dialogs.html) at this time.
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/initial_sdk_setup.md b/_docs/_developer_guide/platform_integration_guides/fireos/initial_sdk_setup.md
index 99e8f4157a..4824fbb2fe 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/initial_sdk_setup.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/initial_sdk_setup.md
@@ -13,7 +13,7 @@ Installing the Braze SDK will provide you with basic analytics functionality as
 Braze is in the process of sunsetting formal support for the Eclipse IDE as [Google is sunsetting support for the Eclipse Android Developer Tools Plugin][43]. If you need assistance with your Eclipse integration prior to migration please [email Support]({{ site.baseurl }}/support_contact/) for assistance.
 
 ### Step 1: Integrate the Braze Library
-The Braze Android SDK can optionally be integrated without UI components. However, In-App Messaging, the News Feed, and Feedback will be rendered inoperable unless you pass the custom data to a UI solely of your design. Additionally, push notifications will not work because our `BroadcastReceiver` that handles push is in the UI library. Please note that these UI elements are open source and [fully customizable][1]. We strongly recommend integration of these features. Please refer to the [Braze Academy][2] for the benefits of using the Braze News Feed, In-App Message, and Feedback UI.
+The Braze Android SDK can optionally be integrated without UI components. However, In-App Messaging, the News Feed, and Feedback will be rendered inoperable unless you pass the custom data to a UI solely of your design. Additionally, push notifications will not work because our `BroadcastReceiver` that handles push is in the UI library. Please note that these UI elements are open source and [fully customizable][1]. We strongly recommend integration of these features. Please refer to the [User Guide][2] for the benefits of using the Braze News Feed, In-App Message, and Feedback UI.
 
 #### Basic Integration
 In order to access Braze's messaging features, you must integrate the UI library. Please see the following directions to integrate the UI library depending on your IDE:
@@ -112,27 +112,27 @@ The second argument instructs the listener to handle `registerInAppMessageManage
 
 See the [javadoc][63] for more information. Please note that any non-standard manual session integration is not fully supported.
 
-### Step 5: Optional Custom Endpoint Setup
+### Step 5: Custom Endpoint Setup {#step-5-optional-custom-endpoint-setup}
 
-If you have been set up with a custom endpoint your Customer Success Manager will advise you of the correct address. To update the default endpoint in your integration of the Braze SDKs please add the following code:
+Your Braze representative should have already advised you of the [correct endpoint]({{ site.baseurl }}/user_guide/administrative/access_braze/sdk_endpoints/).
 
-**Android**
-
-Add the following code to your `appboy.xml`:
+To update the default endpoint in your integration of the Braze SDKs please add the following code to your `appboy.xml`:
 
 ```
 <string translatable="false" name="com_appboy_custom_endpoint">YOUR_CUSTOM_ENDPOINT_OR_CLUSTER</string>
 ```
 
->  SDK Endpoint configuration via `appboy.xml` is available starting with Braze Android SDK v2.1.1.
+SDK Endpoint configuration via `appboy.xml` is available starting with Braze Android SDK v2.1.1.
 
 ### SDK Integration Complete
-Braze should now be collecting data from your application and your basic integration should be complete. Please see the following sections in order to enable custom event tracking, push messaging, the news-feed and the complete suite of Braze features.
+Braze will now be able to collect [specified data from your application]({{ site.baseurl }}/user_guide/data_and_analytics/user_data_collection/overview/) and your basic integration should be complete.
+
+Please see the following sections in order to enable [custom event tracking](/developer_guide/platform_integration_guides/android/analytics/tracking_custom_events/#tracking-custom-events), [push messaging](/developer_guide/platform_integration_guides/android/push_notifications/integration/), the [news feed](/developer_guide/platform_integration_guides/android/news_feed/overview/) and the [complete suite](/developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration/) of Braze features.
 
-## Test your Basic Integration
+## Test Your Basic Integration
 
-### Confirm Session Tracking is Working
-At this point you shoud have session tracking working in your Braze integration.  To test this, go to the `App Usage` section of your dashboard, select your application from the select box (defaulted to `All Apps`), and set `Display Data For` to be `Today`.  Then open your app and refresh the page - your main metrics should all have increased by 1.
+### Confirm Session Tracking Is Working
+At this point you should have session tracking working in your Braze integration.  To test this, go to the `App Usage` section of your dashboard, select your application from the select box (defaulted to `All Apps`), and set `Display Data For` to be `Today`.  Then open your app and refresh the page - your main metrics should all have increased by 1.
 
 ![Sessions working][55]
 
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/news_feed.md b/_docs/_developer_guide/platform_integration_guides/fireos/news_feed.md
index 0fbb49f8df..341906f82f 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/news_feed.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/news_feed.md
@@ -167,7 +167,7 @@ To log an impression or click on a Card, call [`Card.logClick()`][7] and [`Card.
 
 ### Defining a News Feed Category
 
-Instances of the Braze News Feed can be configured to only receive cards from a certain “category”. This allows for effective integration of multiple News Feed streams within a single application. For more information on this feature see [Braze Academy][14]
+Instances of the Braze News Feed can be configured to only receive cards from a certain “category”. This allows for effective integration of multiple News Feed streams within a single application. For more information on this feature read our pages on [News Feed best practices][14]
 
 News Feed Categories can be defined by calling the following methods as you load the News Feed:
 
diff --git a/_docs/_developer_guide/platform_integration_guides/fireos/push_notifications/integration.md b/_docs/_developer_guide/platform_integration_guides/fireos/push_notifications/integration.md
index 91d9431663..8dae1bc2df 100644
--- a/_docs/_developer_guide/platform_integration_guides/fireos/push_notifications/integration.md
+++ b/_docs/_developer_guide/platform_integration_guides/fireos/push_notifications/integration.md
@@ -10,7 +10,7 @@ A push notification is an out-of-app alert that appears on the user's screen whe
 
 >  ADM (Amazon Device Messaging) is not supported on non-Amazon devices. In order to test Kindle Push you must have a FireOS device ([see Amazon Listing of supported devices][32]).
 
-Check out [Braze Academy][8] for additional best practices.
+Check out [the Help section][8] for additional best practices.
 
 Braze sends push notifications to Amazon devices using [Amazon Device Messaging (ADM)][14].
 
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/advanced_use_cases/locations_and_geofences.md b/_docs/_developer_guide/platform_integration_guides/ios/advanced_use_cases/locations_and_geofences.md
index 33dfe7ef09..1432814def 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/advanced_use_cases/locations_and_geofences.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/advanced_use_cases/locations_and_geofences.md
@@ -6,7 +6,7 @@ search_rank: 5
 ---
 ## Locations & Geofences
 
-Geofences are only available in select Braze packages. For access please create a support ticket or speak with your Braze Customer Success Manager. Learn more in the [Braze Academy]({{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences/#locations--geofences).
+Geofences are only available in select Braze packages. For access please create a support ticket or speak with your Braze Customer Success Manager. Learn more in [Docs]({{ site.baseurl }}/developer_guide/platform_integration_guides/fireos/advanced_use_cases/locations_and_geofences/#locations--geofences).
 
 To support geofences for iOS:
 
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_custom_attributes.md b/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_custom_attributes.md
index cfeb867eca..922bf7492f 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_custom_attributes.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_custom_attributes.md
@@ -255,7 +255,7 @@ To set up a subscription for your users (either email or push), call the functio
 
 Users who grant permission for an app to send them push notifications are defaulted to the status of `ABKOptedin` as iOS requires an explicit opt in.
 
-> Users will be set to `ABKSubscribed` automatically upon receipt of a valid email address, however we suggest that you establish an explicit opt-in process and set this value to `OptedIn` upon receipt of explicit consent from your user. [See Braze Academy for details][12].
+> Users will be set to `ABKSubscribed` automatically upon receipt of a valid email address, however we suggest that you establish an explicit opt-in process and set this value to `OptedIn` upon receipt of explicit consent from your user. [See the User Guide for details][12].
 
 #### Setting Email Subscriptions
 
@@ -297,7 +297,7 @@ Appboy.sharedInstance().user.setPushNotificationSubscriptionType(ABKNotification
 
 >  Users who grant permission for an app to send them push notifications are defaulted to the status of `ABKOptedin` as iOS requires an explicit optin.
 
-For more information on implementing subscriptions, visit the topic on [Braze Academy][10].
+For more information on implementing subscriptions, visit our page on [managing user subscriptions][10].
 
 [1]: {{ site.baseurl }}/developer_guide/platform_wide/analytics_overview/#user-data-collection
 [2]: http://en.wikipedia.org/wiki/ISO_8601
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_user_ids.md b/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_user_ids.md
index 1705bd1fbf..57122fa93c 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_user_ids.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/analytics/setting_user_ids.md
@@ -8,7 +8,7 @@ search_rank: 5
 
 User IDs should be set for each of your users. These should be unchanging and accessible when a user opens the app. A database ID or a hashed email address/username is usually a good reference to use. We __strongly recommend__ providing this identifier as it will allow you to:
 
-- Track your users across devices and platforms, improving the quality of your behaviorial and demographic data.
+- Track your users across devices and platforms, improving the quality of your behavioral and demographic data.
 - Import data about your users using our [User Data API][1].
 - Target specific users with our [Messaging API][2] for both general and transactional messages.
 
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/analytics/uninstall_tracking.md b/_docs/_developer_guide/platform_integration_guides/ios/analytics/uninstall_tracking.md
index 09a628668f..3893b89c2f 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/analytics/uninstall_tracking.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/analytics/uninstall_tracking.md
@@ -40,7 +40,7 @@ To ensure that your app does not take any unwanted automatic actions upon receiv
 
 #### Step 4: Enable Uninstall Tracking
 
-Follow the instructions for enabling [Uninstall Tracking][6] on Braze Academy.
+Follow the instructions for enabling uninstall tracking using our [article on Uninstall Tracking][6].
 
 [1]: https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md
 [2]: https://github.com/Appboy/appboy-ios-sdk/blob/master/Example/Stopwatch/AppDelegate.m
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/customization.md b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/customization.md
index 8780ed1650..ce2f95c46e 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/customization.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/customization.md
@@ -1,7 +1,7 @@
 ---
 nav_title: Customization
 platform: iOS
-page_order: 3
+page_order: 1
 search_rank: 5
 ---
 
@@ -9,10 +9,6 @@ search_rank: 5
 
 All of Braze's in-app message types are highly customizable across messages, images, [Font Awesome][26] icons, click actions, analytics, editable styling, custom display options, and custom delivery options. Multiple options can be configured on a per in-app message basis from [within the dashboard][13]. Braze additionally provides multiple levels of advanced customization to satisfy a variety of use cases and needs.
 
-![Foodo In-App Message Customization Example][21]
-
-_An example of in-app message customization from a Braze client._
-
 ## Key-Value Pair Extras
 
 `ABKInAppMessage` objects may carry key-value pairs as `extras`. These are specified on the dashboard when creating an in-app message campaign. Key-value pairs can be used to send data down along with an in-app message for further handling by your app, allowing you to add custom behaviors on top of what Braze provides.
@@ -420,7 +416,7 @@ This will be called when a notification is received whilst the application is in
 
 ### Step 2: Create a Push Campaign
 
-Create a silent push campaign which is triggered via the server sent event. For details on how to create a silent push campaign please review this section of our [Academy][39].
+Create a silent push campaign which is triggered via the server sent event. For details on how to create a silent push campaign please review this section of our [Docs][39].
 
 ![serverEventTrigger][40]
 
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/local_in-app_message_delivery.md b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_delivery.md
similarity index 65%
rename from _docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/local_in-app_message_delivery.md
rename to _docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_delivery.md
index 1ba4bcb2d9..fe3c987a15 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/local_in-app_message_delivery.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_delivery.md
@@ -1,29 +1,63 @@
 ---
-nav_title: Local In-App Message Delivery
+nav_title: In-App Message Delivery
 platform: iOS
-page_order: 2
+page_order: 3
 search_rank: 5
 ---
 
-# Local In-App Message Delivery
+## In-App Message Delivery
 
-## The In-App Message Stack
+### Trigger Types
 
-### Showing In-App Messages
+Our in-app message product allows you to trigger in-app message display as a result of several different event types: `Any Purchase`, `Specific Purchase`, `Session Start`, `Custom Event`, `Push Click`.  Furthermore, `Specific Purchase` and `Custom Event` triggers can contain robust property filters.
+
+{% alert important %}
+Triggered in-app messages only work with custom events logged through the SDK and not through the Rest APIs. If you're working with iOS, check out how to log custom events [here]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/tracking_custom_events/#tracking-custom-events).
+{% endalert %}
+
+### Delivery Semantics
+
+All in-app messages that a user is eligible for are delivered to the user's device on session start. For more information about the SDK's session start semantics, see our [session lifecycle documentation][45]. Upon delivery, the SDK will pre-fetch assets so that they are available immediately at trigger time, minimizing display latency.
+
+When a trigger event has more than one eligible in-app message associated with it, only the in-app message with the highest priority will be delivered.
+
+For in-app messages that display immediately on delivery, (session start, push click) there can be some latency due to assets not being prefetched.
+
+### Minimum Time Interval Between Triggers
+
+By default, we rate limit in-app messages to once every 30 seconds to ensure a quality user experience.
+
+You can override this value via the `ABKMinimumTriggerTimeIntervalKey` inside the `appboyOptions` parameter passed to `startWithApiKey:inApplication:withLaunchOptions:withAppboyOptions:`. Set the `ABKMinimumTriggerTimeIntervalKey` to the integer value you want as your minimum time in seconds between in-app messages:
+
+```objc
+// Sets the minimum trigger time interval to 5 seconds
+[Appboy startWithApiKey:@"YOUR-API_KEY"
+          inApplication:application
+      withLaunchOptions:options
+      withAppboyOptions:@{ ABKMinimumTriggerTimeIntervalKey : @(5) }];
+```
+
+An example of overriding the default trigger interval can be found in our sample application's [`AppDelegate.m`][https://github.com/Appboy/appboy-ios-sdk/blob/master/Example/Stopwatch/AppDelegate.m] file.
+
+## Local In-App Message Delivery
+
+### The In-App Message Stack
+
+#### Showing In-App Messages
 
 When a user is eligible to receive an in-app message, the `ABKInAppMessageController` will be offered the latest in-app message off the in-app message stack. The stack only persists stored in-app messages in memory and is cleared up between app launches from suspended mode.
 
-### Adding In-App Messages to the Stack
+#### Adding In-App Messages to the Stack
 
 Users are eligible to receive an in-app message in the following situations:
 
-- An in-app message trigger event is fired ([In-App Messages][27])
-- Session start event ([In-App Messages][27])
-- A push comes in while the app is open
+- An in-app message trigger event is fired
+- Session start event
+- The app is opened from a push notification
 
 Triggered in-app messages are placed on top of the stack when their trigger event is fired. If multiple in-app messages are in the stack and waiting to be displayed, Braze will display the most recently received in-app message first (last in, first out).
 
-### Returning In-App Messages to the Stack
+#### Returning In-App Messages to the Stack
 
 A triggered in-app message can be returned back to the stack in the following situations:
 
@@ -32,7 +66,7 @@ A triggered in-app message can be returned back to the stack in the following si
 - The deprecated `beforeInAppMessageDisplayed:withKeyboardIsUp:` [UI delegate method][38] has **NOT** been implemented, and the keyboard is currently being displayed
 - The `beforeInAppMessageDisplayed:` [delegate method][30] or the deprecated `beforeInAppMessageDisplayed:withKeyboardIsUp:` [UI delegate method][38] returned `ABKDisplayInAppMessageLater`
 
-### Discarding In-App Messages
+#### Discarding In-App Messages
 
 A triggered in-app message will be discarded in the following situations:
 
@@ -43,7 +77,7 @@ A triggered in-app message will be discarded in the following situations:
 - The in-app message is a full in-app message but has no image
 - The in-app message is a image-only modal in-app message but has no image
 
-### Manually Queue In-App Message Display
+#### Manually Queue In-App Message Display
 
 If you wish to display an in-app message at other times within your app, you may manually display the top-most in-app message on the stack by calling the following method:
 
@@ -52,7 +86,7 @@ If you wish to display an in-app message at other times within your app, you may
 // YOUR_IN_APP_MESSAGE_DELEGATE should be replaced with your in-app message controller delegate, if you have implemented one.
 ```
 
-## Real Time In-App Message Creation & Display
+### Real Time In-App Message Creation & Display
 
 In-app messages can also be locally created within the app and displayed via Braze. This is particularly useful for displaying messages that you wish to trigger within the app in real-time. Braze does not support analytics on in-app messages created locally.
 
@@ -66,7 +100,6 @@ In-app messages can also be locally created within the app and displayed via Bra
 }
 ```
 
-
 [1]: #customize-inAppMessage-dashboard
 [2]: #customize-inAppMessage-code
 [3]: #set-delegate
@@ -86,7 +119,6 @@ In-app messages can also be locally created within the app and displayed via Bra
 [17]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessageView.h
 [18]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessageViewController.h
 [19]: https://github.com/Appboy/appboy-ios-sdk/blob/master/Samples/InAppMessage/BrazeInAppMessageSample/BrazeInAppMessageSample/CustomInAppMessageViewController.m
-[21]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
 [23]: #setting-delegates
 [25]: https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#2121
 [26]: http://fortawesome.github.io/Font-Awesome/
@@ -105,3 +137,5 @@ In-app messages can also be locally created within the app and displayed via Bra
 [40]: {% image_buster /assets/img_archive/iosServerSentPush.png %}
 [41]: {% image_buster /assets/img_archive/iOSServerPush.png %}
 [42]: {% image_buster /assets/img_archive/iosIAMeventTrigger.png %}
+[44]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/tracking_custom_events/#tracking-custom-events
+[45]: {{ site.baseurl }}/developer_guide/platform_integration_guides/{{ include.platform }}/analytics/tracking_sessions/#session-lifecycle
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_templates.md b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_templates.md
index cda956f9ab..62ffe11127 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_templates.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_templates.md
@@ -8,6 +8,12 @@ search_rank: 5
 # In-App Message Templates
 
 ## Custom App Store Review Prompt
+
+{% alert note %}
+Once you implement this prompt, Braze stops automatically tracking impressions and you must log analytics with the methods found [here]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/customization/#logging-impressions-and-clicks).
+
+{% endalert %}
+
 {% raw %}
 Creating a campaign to ask users for an App Store review is a popular usage of in-app messages.
 
@@ -48,7 +54,7 @@ Next, create an In-App Messaging campaign with the following:
 {% endraw %}
 
 {% alert tip %}
-  Apple limits App Store review prompts to a maximum of three (3) times per year for each user, so your campaign should be [rate-limited]({{ site.baseurl }}/user_guide/engagement_tools/campaigns/testing_and_more/rate-limiting/#user-centric-rate-limiting) to three times per year per user. 
+  Apple limits App Store review prompts to a maximum of three (3) times per year for each user, so your campaign should be [rate-limited]({{ site.baseurl }}/user_guide/engagement_tools/campaigns/testing_and_more/rate-limiting/#user-centric-rate-limiting) to three times per year per user.
 
   Users may turn off App Store review prompts. As a result, your custom review prompt should not promise that a native App Store review prompt will appear, or directly ask for a review.
 {% endalert %}
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_types.md b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_types.md
deleted file mode 100644
index 548510563a..0000000000
--- a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_types.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-nav_title: In-App Message Types
-platform: iOS
-page_order: 1
-search_rank: 5
----
-
-# In-App Message Types
-Braze currently offers the following default in-app message types: `Slideup`, `Modal`, `Full` and `HTML Full`. Each in-app message type is highly customizable across content, images, icons, click actions, analytics, display and delivery.
-
-All in-app messages are subclasses of the `ABKInAppMessage`, which defines basic behavior and traits for all in-app messages. The in-app message class structures as following:
-
-![ABKInAppMessage models][29]
-
-{% include archive/in_app_message.md platform="iOS" %}
-
-[1]: #customize-inAppMessage-dashboard
-[2]: #customize-inAppMessage-code
-[3]: #set-delegate
-[4]: #customize-inAppMessage-display
-[5]: #before-display
-[6]: #manual-cue
-[7]: #situational-display
-[8]: #inAppMessage-click
-[9]: #custom-view
-[10]: #custom-inAppMessage
-[11]: #custom-complete
-[12]: #method-declarations
-[13]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
-[14]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessage.h
-[15]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessageController.h
-[16]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessageControllerDelegate.h
-[17]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessageView.h
-[18]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessageViewController.h
-[19]: https://github.com/Appboy/appboy-ios-sdk/blob/master/Samples/InAppMessage/BrazeInAppMessageSample/BrazeInAppMessageSample/CustomInAppMessageViewController.m
-[21]: {% image_buster /assets/img_archive/foodo-slideup.gif %}
-[23]: #setting-delegates
-[25]: https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#2121
-[26]: http://fortawesome.github.io/Font-Awesome/
-[27]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#in-app-messages-triggered
-[29]: {% image_buster /assets/img_archive/ABKInAppMessage-models.png %}
-[30]: #in-app-message-controller-delegate
-[31]: #customizing-appboy-on-startup
-[32]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/ABKInAppMessageControllerDelegate.h
-[33]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/push_notifications/troubleshooting/#step-2-devices-register-for-apns-and-provide-braze-with-push-tokens
-[34]: https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyUI/InAppMessage/ABKInAppMessageUIDelegate.h
-[35]: https://github.com/Appboy/appboy-ios-sdk/blob/master/Samples/InAppMessage/BrazeInAppMessageSample/BrazeInAppMessageSample/ViewController.m
-[36]: https://github.com/Appboy/appboy-ios-sdk/blob/master/Samples/InAppMessage/BrazeInAppMessageSample/BrazeInAppMessageSample/AppDelegate.m
-[37]: https://github.com/Appboy/appboy-ios-sdk/tree/master/AppboyUI/InAppMessage/ViewControllers
-[38]: #in-app-mssage-ui-delegate
-[39]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/push_notifications/silent_push_notifications/
-[40]: {% image_buster /assets/img_archive/iosServerSentPush.png %}
-[41]: {% image_buster /assets/img_archive/iOSServerPush.png %}
-[42]: {% image_buster /assets/img_archive/iosIAMeventTrigger.png %}
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/overview.md b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/overview.md
index 91fe268f4d..8d6e7b74c7 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/overview.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/overview.md
@@ -5,11 +5,122 @@ page_order: 0
 search_rank: 5
 ---
 
-# In-App Messaging
+# In-App Messages
 
-In-app messages are great for creating unobtrusive calls to action, notifying people of new content in the News Feed and driving them toward it or communicating with users who have push turned off. In-app messages are also effective for other content that isn't time-sensitive enough to warrant a push notification, or permanent enough to warrant a News Feed item. You can find a detailed explanation of in-app message behavior in [Braze Academy][13].
+__In-App Messages__ help you get content to your user without interrupting their day with a push notification. Customized and tailored in-app messages enhance the user experience and help your audience get the most value out of your app. With a variety of layouts and customization tools to choose from, in-app messages engage your users more than ever before.
+
+To see examples of in-app messages, check out our [Client Integration Gallery][31].
+
+{% comment %}
+Embed video on the right. Demos all of the topics mentioned on this page.
+{% endcomment %}
+
+{% alert note %}
+Braze has refreshed in-app messages! Though the creation process is very much the same, our in-app messages have a new, modern look and feel optimized for the best experiences for your customers and give you more options to personalize the experience. For more information on our most recent upgrades to in-app messages, check out our [Generation Comparison documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/generations/)!
+{% endalert %}
+
+[Create an in-app message]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/) now!
 
 By default, in-app messages are enabled after completing the standard SDK integration, including GIF support. Note that if you did not integrate SDWebImage, in-app messages with images will not work.
 
+## When to Use In-App Messages
+
+In-app messages are good for a lot of things. They can be used in web apps, Android apps, iOS apps, and more!
+
+In-app messages don't deliver outside of the user's app and won't intrude on their home screen, like push notifications do. In-app messages, by their nature, exist within your app and come with context and are almost never unwelcome! They're always delivered when the user is active within your app.
+
+### Great Use Cases
+
+- New App Features
+- App Management
+- Reviews
+- App Upgrades/Updates
+- Giveaways & Sweepstakes
+- Sales and Promotions
+- Product Sales
+- Encouraging and rewarding discovery
+- [Permission Requests/Push Priming][30]
+
+## In-App Message Types
+Braze currently offers the following default in-app message types: `Slideup`, `Modal`, `Full` and `HTML Full`. Each in-app message type is highly customizable across content, images, icons, click actions, analytics, display and delivery.
+
+All in-app messages are subclasses of the `ABKInAppMessage`, which defines basic behavior and traits for all in-app messages. The in-app message class structures as following:
+
+![ABKInAppMessage models][29]
+
+### Expected Behaviors by Message Types
+
+These are what it looks like for your users to open one of our out-of-the-box in-app message types.
+
+{% tabs %}
+  {% tab Slideup %}
+
+  [`Slideup`](http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_slideup.html)in-app messages are so-named because they "slide up" or "slide down" from the top or bottom of the screen.  They cover a small portion of the screen and provide an effective and non-intrusive messaging capability.
+
+  <br>
+
+  ![Slideup Behavior]({% image_buster /assets/img/slideup-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+{% endtab %}
+{% tab Modal %}
+
+[`Modal`](http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_modal.html)in-app messages appear in the center of the screen and are framed by a translucent panel. Useful for more critical messaging, they can be equipped with up to two click action and analytics enabled buttons.
+
+ <br>
+
+  ![Modal Behavior]({% image_buster /assets/img/modal-behavior.gif %}){: style="border:0px;"}
+
+ <br>
+
+{% endtab %}
+{% tab Full Screen %}
+
+[`Full`](http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_full.html)in-app messages are useful for maximizing the content and impact of your user communication.  The upper half of a `full` in-app message contains an image and the lower half displays text as well as up to two click action and analytics enabled buttons.
+
+<br>
+
+![Full-Screen Behavior]({% image_buster /assets/img/full-screen-behavior.gif %}){: style="border:0px;"}
+
+<br>
+
+{% endtab %}
+{% tab Custom HTML %}
+
+[`HTML Full`](http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_h_t_m_l_full.html) in-app messages are useful for creating fully customized user content. User-defined HTML Full in-app message content is displayed in a `UIWebView`and may optionally contain other rich content, such as images and fonts, allowing for full control over message appearance and functionality.
+
+The following example shows a paginated HTML Full in-app message:
+
+![HTML5 Example]({% image_buster /assets/img_archive/ios-html-full-iam.gif %})
+
+> Full in-app message content is displayed in a UIWebView and may optionally contain other rich content, such as images and fonts, allowing for full control over message appearance and functionality. **Please note that we currently do not support display of custom HTML in-app messages in an iFrame on the iOS and Android platforms.**
+
+{% endtab %}
+{% endtabs %}
+
 
-[13]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
+[1]: http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_slideup.html
+[2]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageSlideup.html
+[3]: http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_modal.html
+[4]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageModal.html
+[5]: http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_full.html
+[6]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageFull.html
+[7]: http://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_h_t_m_l_full.html
+[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/InAppMessageHtmlFull.html
+[9]: {% image_buster /assets/img_archive/In-App_Slideup.png %}
+[10]: {% image_buster /assets/img_archive/In-App_Modal.png %}
+[11]: {% image_buster /assets/img_archive/In-App_Full.png %}
+[12]: {% image_buster /assets/img_archive/HTML5.gif %}
+[13]: {% image_buster /assets/img_archive/trigger-iam-composer.png %}
+[14]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#original-in-app-messages
+[15]: {{ site.baseurl }}/developer_guide/platform_integration_guides/{{ include.platform }}/analytics/tracking_sessions/#session-lifecycle
+[16]: https://github.com/Appboy/appboy-ios-sdk/blob/master/Example/Stopwatch/AppDelegate.m
+[17]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/res/values/appboy.xml
+[19]: {{ site.baseurl }}/developer_guide/platform_integration_guides/{{ include.platform }}/in-app_messaging/#in-app-messages-triggered
+[23]: {% image_buster /assets/img_archive/ios-html-full-iam.gif %}
+[24]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_custom_events/#tracking-custom-events
+[25]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/tracking_custom_events/#tracking-custom-events
+[29]: {% image_buster /assets/img_archive/ABKInAppMessage-models.png %}
+[30]: {{ site.baseurl }}/help/best_practices/push/creating_custom_opt-in_prompts/#creating-custom-opt-in-prompts
+[31]: {{ site.baseurl }}/help/best_practices/client_integration_gallery/#client-integration-iam
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/troubleshooting_in-app_messages.md b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/troubleshooting.md
similarity index 98%
rename from _docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/troubleshooting_in-app_messages.md
rename to _docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/troubleshooting.md
index ae5e0053b7..4752375f90 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/troubleshooting_in-app_messages.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/in-app_messaging/troubleshooting.md
@@ -1,7 +1,7 @@
 ---
-nav_title: Troubleshooting In-App Messages
+nav_title: Troubleshooting
 platform: iOS
-page_order: 5
+page_order: 4
 search_rank: 5
 ---
 
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/initial_sdk_setup/initial_sdk_setup.md b/_docs/_developer_guide/platform_integration_guides/ios/initial_sdk_setup/initial_sdk_setup.md
index 611d74940e..cbe1b413b6 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/initial_sdk_setup/initial_sdk_setup.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/initial_sdk_setup/initial_sdk_setup.md
@@ -6,6 +6,11 @@ search_rank: 5
 ---
 
 # Initial SDK Setup
+
+{% alert important %}
+The iOS SDK file size is _1MB to 2MB_ for the IPA, in addition to App File, and 30MB for the Framework.
+{% endalert %}
+
 {% include archive/apple/initial_setup.md platform="iOS" %}
 
 
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/integration.md b/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/integration.md
index 74def1348b..51969ec228 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/integration.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/integration.md
@@ -4,6 +4,11 @@ platform: iOS
 page_order: 0
 search_rank: 5
 ---
+
+{% alert tip %}
+We strongly recommend that you implement the SDK via a [CocoaPod](http://cocoapods.org/). It will save you a lot of time and automate much of the process for you. However, if you are unable to do so you may complete integration manually without CocoaPods by using our manual integration instructions [here]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/manual_integration_options/#manual-integration-options).
+{% endalert %}
+
 ## Integration {#push-integration}
 
 A push notification is an out-of-app alert that appears on the user's screen when an important update occurs. Push notifications are a valuable way to provide your users with time-sensitive and relevant content or to re-engage them with your app.
@@ -20,7 +25,7 @@ For more information and best practices on push, visit our [Braze Academy][0] pa
 
 #### Recommended Option: Using a .p8 File (Authentication Tokens)
 
-As described on [this page](http://help.apple.com/xcode/mac/current/#/dev54d690a66),
+As described on [this page](https://help.apple.com/developer-account/#/devcdfbb56a3),
 
 1. In your developer account, go to [Certificates, Identifiers & Profiles](https://developer.apple.com/account/ios/certificate).
 2. Under Keys, select All and click the Add button (+) in the upper-right corner.
@@ -65,7 +70,7 @@ Alternately, you may utilize Apple's older authentication scheme (.p12 SSL certi
 
 ### Step 2: Enable Push Capabilities
 
-In your project settings, ensure that under the `Capabilities` tab your `Push Notifications` capability is toggled on, as described on [this page](http://help.apple.com/xcode/mac/current/#/devdfd3d04a1).
+In your project settings, ensure that under the `Capabilities` tab your `Push Notifications` capability is toggled on, as described on [this page](https://help.apple.com/developer-account/#/devcdfbb56a3).
 
 ![enable push notification][24]
 
@@ -411,11 +416,11 @@ Use the following code to register for Braze's default push categories when you
 {% tab OBJECTIVE-C %}
 
 ```objc
-// For UserNotification.framework
+// For UserNotification.framework (iOS 10+ only)
 NSSet *appboyCategories = [ABKPushUtils getAppboyUNNotificationCategorySet];
 [[UNUserNotificationCenter currentNotificationCenter] setNotificationCategories:appboyCategories];
 
-// For UIUserNotificationSettings
+// For UIUserNotificationSettings (before iOS 10)
 NSSet *appboyCategories = [ABKPushUtils getAppboyUIUserNotificationCategorySet];
 UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:UIUserNotificationTypeBadge
                                                                          categories:appboyCategories];
@@ -426,11 +431,11 @@ UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTy
 {% tab swift %}
 
 ```swift
-// For UserNotification.framework
+// For UserNotification.framework (iOS 10+ only)
 let appboyCategories = ABKPushUtils.getAppboyUNNotificationCategorySet()
 UNUserNotificationCenter.current().setNotificationCategories(appboyCategories)
 
-// For UIUserNotificationSettings
+// For UIUserNotificationSettings (before iOS 10)
 let appboyCategories = ABKPushUtils.getAppboyUIUserNotificationCategorySet()
 let settings = UIUserNotificationSettings.init(types: .badge, categories: appboyCategories)
 UIApplication.shared.registerUserNotificationSettings(settings)
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/silent_push_notifications.md b/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/silent_push_notifications.md
index df0d8cb854..0745c8e392 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/silent_push_notifications.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/push_notifications/silent_push_notifications.md
@@ -41,7 +41,6 @@ Braze has several features which rely on iOS Silent Push Notifications:
 |---|---|
 |Uninstall Tracking | User receives a silent, nightly uninstall tracking push.|
 |Geofences | Silent syncing of geofences from server to device.|
-|Push Stories | User receives a push story.|
 
 For more information, check out Apple's developer site on the [Instance Method][7] and [Unreceived Notifications][8].
 
diff --git a/_docs/_developer_guide/platform_integration_guides/ios/push_story.md b/_docs/_developer_guide/platform_integration_guides/ios/push_story.md
index 0677c8735e..5939ec0991 100644
--- a/_docs/_developer_guide/platform_integration_guides/ios/push_story.md
+++ b/_docs/_developer_guide/platform_integration_guides/ios/push_story.md
@@ -150,7 +150,7 @@ In your `NotificationViewController.m`, remove the default implementation and ad
 
 Open the Info.plist file of the Notification Content Extension and add/change following keys under `NSExtension \ NSExtensionAttributes`:
 
-`UNNotificationExtensionCategory` = `ab_cat_push_story` (`String` type)
+`UNNotificationExtensionCategory` = `ab_cat_push_story_v2` (`String` type)
 `UNNotificationExtensionDefaultContentHidden` = `YES` (`Boolean` type)
 `UNNotificationExtensionInitialContentSizeRatio` = `0.65` (`Number` type)
 
diff --git a/_docs/_developer_guide/platform_integration_guides/react_native/android_and_fireos/analytics/logging_custom_events.md b/_docs/_developer_guide/platform_integration_guides/react_native/android_and_fireos/analytics/logging_custom_events.md
index 5e7d6e4ef7..a938a669f2 100644
--- a/_docs/_developer_guide/platform_integration_guides/react_native/android_and_fireos/analytics/logging_custom_events.md
+++ b/_docs/_developer_guide/platform_integration_guides/react_native/android_and_fireos/analytics/logging_custom_events.md
@@ -11,7 +11,7 @@ See [the Android integration instructions][1] for in depth discussion of event t
 ```javascript
 var properties = {};
 properties["KeyOne"] = "Val1";
-ReactAppboy.logCustomEvent("cordovaCustomEventWithProperties", properties);
+ReactAppboy.logCustomEvent("reactNativeCustomEventWithProperties", properties);
 ```
 
 [1]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/
diff --git a/_docs/_developer_guide/platform_integration_guides/react_native/ios/analytics/logging_custom_events.md b/_docs/_developer_guide/platform_integration_guides/react_native/ios/analytics/logging_custom_events.md
index 2a29d749af..e03aed8fee 100644
--- a/_docs/_developer_guide/platform_integration_guides/react_native/ios/analytics/logging_custom_events.md
+++ b/_docs/_developer_guide/platform_integration_guides/react_native/ios/analytics/logging_custom_events.md
@@ -11,7 +11,7 @@ See [the iOS integration instructions][1] for in depth discussion of event track
 ```javascript
 var properties = {};
 properties["KeyOne"] = "Val1";
-ReactAppboy.logCustomEvent("cordovaCustomEventWithProperties", properties);
+ReactAppboy.logCustomEvent("reactNativeCustomEventWithProperties", properties);
 ```
 
 [1]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/tracking_custom_events/
diff --git a/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_custom_attributes.md b/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_custom_attributes.md
index 1edeaa4489..216b931850 100644
--- a/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_custom_attributes.md
+++ b/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_custom_attributes.md
@@ -138,7 +138,7 @@ To set up a subscription for your users (either email or push), call the functio
 | `SUBSCRIBED` | Subscribed, but not explicitly opted in |
 | `UNSUBSCRIBED` | Unsubscribed and/or explicitly opted out |
 
->  No explicit opt-in is required by Windows to send users push notifications. When a user is registered for push, they are set to `SUBSCRIBED` rather than `OPTED_IN` by default. For more information on implementing subscriptions and explicit opt-ins, visit the topic on [Braze Academy][10].
+>  No explicit opt-in is required by Windows to send users push notifications. When a user is registered for push, they are set to `SUBSCRIBED` rather than `OPTED_IN` by default. To learn more, check out our documentation on [implementing subscriptions and explicit opt-ins][10].
 
 - `EmailNotificationSubscriptionType`
   - Users will be set to `SUBSCRIBED` automatically upon receipt of a valid email address. However, we suggest that you establish an explicit opt-in process and set this value to `OPTED_IN` upon receipt of explicit consent from your user. [See Braze Academy for details][8].
diff --git a/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_user_ids.md b/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_user_ids.md
index 2157ee9521..4fcd8bc86e 100644
--- a/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_user_ids.md
+++ b/_docs/_developer_guide/platform_integration_guides/unity/Analytics/setting_user_ids.md
@@ -7,7 +7,7 @@ page_order: 0
 
 A user ID should be set for each of your users. These should be unchanging and accessible when a user opens the app. Something like a username, or a unique identifier from your database is usually a good reference to use. We __strongly recommend__ providing this identifier. It will allow you to:
 
-- Track your users across devices and platforms, improving the quality of your behaviorial and demographic data.
+- Track your users across devices and platforms, improving the quality of your behavioral and demographic data.
 - Import data about your users using our [User API][1] from any source.
 - Target specific users with our [Messaging API][2] for both general and transactional messages.
 
diff --git a/_docs/_developer_guide/platform_integration_guides/unity/android/push_notifications.md b/_docs/_developer_guide/platform_integration_guides/unity/android/push_notifications.md
index d9f76aff96..201bc9c1cd 100644
--- a/_docs/_developer_guide/platform_integration_guides/unity/android/push_notifications.md
+++ b/_docs/_developer_guide/platform_integration_guides/unity/android/push_notifications.md
@@ -12,7 +12,7 @@ Sample push notification:
 
 ![Sample Push][23]
 
-Check out [Braze Academy][8] for additional best practices.
+Check out [our troubleshooting section][8] for additional best practices.
 
 Braze sends push notifications to Android devices using [Firebase Cloud Messaging (FCM)][9].
 
diff --git a/_docs/_developer_guide/platform_integration_guides/web/analytics/setting_user_ids.md b/_docs/_developer_guide/platform_integration_guides/web/analytics/setting_user_ids.md
index 1c1e4f2664..3d5d641a70 100644
--- a/_docs/_developer_guide/platform_integration_guides/web/analytics/setting_user_ids.md
+++ b/_docs/_developer_guide/platform_integration_guides/web/analytics/setting_user_ids.md
@@ -8,7 +8,7 @@ search_rank: 5
 
 User IDs should be set for each of your users. These should be unchanging and accessible when a user opens the app. A database ID or a hashed email address/username is usually a good reference to use. We __strongly recommend__ providing this identifier as it will allow you to:
 
-- Track your users across devices and platforms, improving the quality of your behaviorial and demographic data.
+- Track your users across devices and platforms, improving the quality of your behavioral and demographic data.
 - Import data about your users using our [User Data API][1].
 - Target specific users with our [Messaging API][2] for both general and transactional messages.
 
diff --git a/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/customization.md b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/customization.md
new file mode 100644
index 0000000000..726e4a26ca
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/customization.md
@@ -0,0 +1,74 @@
+---
+nav_title: Customization
+platform: Web
+page_order: 3
+search_rank: 5
+---
+
+## Customization {#in-app-message-customization}
+
+All of Braze’s in-app message types are highly customizable across messages, images, [Font Awesome][15]  icons, click actions, analytics, editable styling, custom display options, and custom delivery options. Multiple options can be configured on a per in-app message basis from [within the dashboard]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/). Braze additionally provides multiple levels of advanced customization to satisfy a variety of use cases and needs.
+
+### Key-Value Pair Extras
+
+In-app message objects may carry key-value pairs as their `extras` property. These are specified on the dashboard under "Additional Message Settings" when creating an in-app message campaign. These can be used to send data down along with an in-app message for further handling by your site. For example:
+
+```javascript
+appboy.subscribeToNewInAppMessages(function(inAppMessages) {
+  if (inAppMessages[0] instanceof appboy.ab.InAppMessage) {
+    var extras = inAppMessages[0].extras;
+    for (var key in extras) {
+      if (data.hasOwnProperty(key)) {
+         console.log("key: " + key + ", value: " + extras[key]);
+      }
+    }
+  }
+
+  appboy.display.showInAppMessage(inAppMessages[0]);
+  return inAppMessages.slice(1);
+});
+```
+
+### Custom Styling
+
+Braze UI elements come with a default look and feel that create a neutral in-app message experience and and aims for consistency with other Braze mobile platforms. Braze's default styles are defined in CSS within the Braze SDK. By overriding selected styles in your application, it is possible to customize our standard in-app message types with your own background images, font families, styles, sizes, animations, and more. For instance, the following is an example override that will cause an in-app message's headers to appear italicized:
+
+```css
+  body .ab-in-app-message .ab-message-header {
+    font-style: italic;
+  }
+```
+
+See the [JSDocs][2] for more information.
+
+
+[1]: https://github.com/Appboy/appboy-web-sdk#getting-started
+[2]: https://js.appboycdn.com/web-sdk/latest/doc/ab.InAppMessage.html
+[3]: https://js.appboycdn.com/web-sdk/latest/doc/ab.SlideUpMessage.html
+[4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[5]: #display-in-app
+[6]: https://js.appboycdn.com/web-sdk/latest/doc/ab.ModalMessage.html
+[7]: https://js.appboycdn.com/web-sdk/latest/doc/ab.FullScreenMessage.html
+[8]: https://js.appboycdn.com/web-sdk/latest/doc/ab.ControlMessage.html
+[9]: https://js.appboycdn.com/web-sdk/latest/doc/module-appboy.html#.initialize
+[10]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/analytics/tracking_sessions/#session-lifecycle
+[11]: #inapp-customization
+[12]: https://js.appboycdn.com/web-sdk/latest/doc/ab.HtmlMessage.html
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
+[14]: #key-value
+[15]: https://fontawesome.com/?from=io
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#modal-in-app-messages
+[30]: {% image_buster /assets/img_archive/trigger-iam-composer.png %}
+[32]: #in-app-messages-triggered
+[33]: #original-in-app-messages-deprecated
+[35]: #styling
+[40]: #message-types
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#full-in-app-messages
+[42]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#html-in-app-messages
+[46]: #inapp-control
+[47]: {% image_buster /assets/img_archive/In-App_Full.png %}
+[48]: {% image_buster /assets/img_archive/In-App_Modal.png %}
+[49]: {% image_buster /assets/img_archive/Web_Slideup.png %}
+[50]: https://github.com/carlsednaoui/ouibounce
+[51]: {% image_buster /assets/img_archive/ios-html-full-iam.gif %}
+[52]: {{ site.baseurl }}/help/best_practices/in-app_messages/web_browsers_only/#web-html-messages
diff --git a/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/in-app_message_delivery.md b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/in-app_message_delivery.md
new file mode 100644
index 0000000000..745ddc6487
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/in-app_message_delivery.md
@@ -0,0 +1,95 @@
+---
+nav_title: In-App Message Delivery
+platform: Web
+page_order: 4
+search_rank: 5
+---
+## In-App Message Delivery
+
+#### Trigger Types
+
+Our in-app message product allows you to trigger in-app message display as a result of several different event types: `Any Purchase`, `Specific Purchase`, `Session Start`, `Custom Event`, `Push Click`.  Furthermore, `Specific Purchase` and `Custom Event` triggers can contain robust property filters.
+
+#### Delivery Semantics
+All in-app messages that a user is eligible for are automatically delivered to the user upon a session start event. For more information about the SDK's session start semantics, see our [session lifecycle documentation][10].
+
+#### Minimum Time Interval Between Triggers
+By default we rate limit in-app messages to once every 30 seconds to ensure a quality user experience. To override this value, you can pass the `minimumIntervalBetweenTriggerActionsInSeconds` configuration option to your [`initialize`][9] function.
+
+```js
+// Sets the minimum time interval between triggered in-app messages to 5 seconds instead of the default 30
+appboy.initialize('YOUR-API-KEY', { minimumIntervalBetweenTriggerActionsInSeconds: 5 })
+```
+
+### Manual In-App Message Display
+
+If you don't want your site to immediately display new in-app messages when they're received, you can disable automatic display and register your own display subscribers. First, find and remove the call to `appboy.display.automaticallyShowNewInAppMessages()` from within your loading snippet.  Then, create your own subscriber:
+
+```javascript
+appboy.subscribeToNewInAppMessages(function(inAppMessages) {
+  // Display the first in-app message. You could defer display here by pushing this message to code within in your own application.
+  // If you don't want to use Braze's built-in display capabilities, you could alternatively pass the in-app message to your own display code here.
+  appboy.display.showInAppMessage(inAppMessages[0]);
+
+  // Return an array with any remaining, unhandled messages to Braze's internal queue.
+  // These will be part of the inAppMessages param the next time this subscriber is invoked.
+  return inAppMessages.slice(1);
+});
+```
+
+The `inAppMessages` parameter will be an array of [`appboy.ab.InAppMessage`][2] subclass or [`appboy.ab.ControlMessage`][8] objects, each of which has various lifecycle event subscription methods. See the [JSDocs][2] for full documentation.
+
+>  Only one [`Modal`][17] or [`Full`][41] in-app message can be displayed at a given time. If you attempt to show a second Modal or Full message while one is already showing, `appboy.display.showInAppMessage` will return false, and the message will automatically be returned to Braze's internal queue, where it will part of the `inAppMessages` array parameter the next time your subscriber is invoked.
+
+#### Local In-App Messages
+
+In-app messages can also be created within your site and displayed locally in real-time.  All customization options available on the dashboard are also available locally.  This is particularly useful for displaying messages that you wish to trigger within the app in real-time. However, analytics on these locally-created messages will not be available within the Braze dashboard.
+
+```javascript
+  // Displays a slideup type in-app message.
+  var message = new appboy.ab.SlideUpMessage("Welcome to Braze! This is an in-app message.");
+  message.slideFrom = appboy.ab.InAppMessage.SlideFrom.TOP;
+  appboy.display.showInAppMessage(message);
+```
+
+### Exit-Intent Messages
+
+Exit-intent in-app messages appear when visitors are about to navigate away from your site. They provide another opportunity to communicate important information to users, while not interrupting their experience on your site. To be able to send these messages, first reference the [open-source library][50] with the code below, which will log 'exit intent' as a custom event. In-app message campaigns can then be created in the dashboard using 'exit intent' as the trigger custom event.
+
+```javascript
+  var _ouibounce = ouibounce(false, {
+    callback: function() { appboy.logCustomEvent('exit intent'); }
+  });
+```
+
+
+[1]: https://github.com/Appboy/appboy-web-sdk#getting-started
+[2]: https://js.appboycdn.com/web-sdk/latest/doc/ab.InAppMessage.html
+[3]: https://js.appboycdn.com/web-sdk/latest/doc/ab.SlideUpMessage.html
+[4]: {{ site.baseurl }}//help/best_practices/in-app_messages/in-app_message_behavior/#in-app-message-behavior
+[5]: #display-in-app
+[6]: https://js.appboycdn.com/web-sdk/latest/doc/ab.ModalMessage.html
+[7]: https://js.appboycdn.com/web-sdk/latest/doc/ab.FullScreenMessage.html
+[8]: https://js.appboycdn.com/web-sdk/latest/doc/ab.ControlMessage.html
+[9]: https://js.appboycdn.com/web-sdk/latest/doc/module-appboy.html#.initialize
+[10]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/analytics/tracking_sessions/#session-lifecycle
+[11]: #inapp-customization
+[12]: https://js.appboycdn.com/web-sdk/latest/doc/ab.HtmlMessage.html
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
+[14]: #key-value
+[15]: http://fortawesome.github.io/Font-Awesome/
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#modal-in-app-messages
+[30]: {% image_buster /assets/img_archive/trigger-iam-composer.png %}
+[32]: #in-app-messages-triggered
+[33]: #original-in-app-messages-deprecated
+[35]: #styling
+[40]: #message-types
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#full-in-app-messages
+[42]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#html-in-app-messages
+[46]: #inapp-control
+[47]: {% image_buster /assets/img_archive/In-App_Full.png %}
+[48]: {% image_buster /assets/img_archive/In-App_Modal.png %}
+[49]: {% image_buster /assets/img_archive/Web_Slideup.png %}
+[50]: https://github.com/carlsednaoui/ouibounce
+[51]: {% image_buster /assets/img_archive/ios-html-full-iam.gif %}
+[52]: {{ site.baseurl }}/help/best_practices/in-app_messages/web_browsers_only/#web-html-messages
diff --git a/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/integration.md b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/integration.md
new file mode 100644
index 0000000000..f6409c03e1
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/integration.md
@@ -0,0 +1,12 @@
+---
+nav_title: Integration
+platform: Web
+page_order: 1
+search_rank: 5
+---
+## Integration
+
+By default, in-app messages are automatically displayed as part of our [recommended integration instructions][1]. Additional customization can be done by following the steps in this guide.
+
+
+[1]: https://github.com/Appboy/appboy-web-sdk#getting-started
diff --git a/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/overview.md b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/overview.md
new file mode 100644
index 0000000000..ed29fcdf50
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/overview.md
@@ -0,0 +1,108 @@
+---
+nav_title: Overview
+platform: Web
+page_order: 0
+search_rank: 5
+---
+# In-App Messages
+
+__In-App Messages__ help you get content to your user without interrupting their day with a push notification. Customized and tailored in-app messages enhance the user experience and help your audience get the most value out of your app. With a variety of layouts and customization tools to choose from, in-app messages engage your users more than ever before.
+
+{% comment %}
+Embed video on the right. Demos all of the topics mentioned on this page.
+{% endcomment %}
+
+{% alert note %}
+Braze has refreshed in-app messages! Though the creation process is very much the same, our in-app messages have a new, modern look and feel optimized for the best experiences for your customers and give you more options to personalize the experience. For more information on our most recent upgrades to in-app messages, check out our [Generation Comparison documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/generations/)!
+{% endalert %}
+
+## When to Use In-App Messages
+
+In-app messages are good for a lot of things. They can be used in web apps, Android apps, iOS apps, and more!
+
+In-app messages don't deliver outside of the user's app and won't intrude on their home screen, like push notifications do. In-app messages, by their nature, exist within your app and come with context and are almost never unwelcome! They're always delivered when the user is active within your app.
+
+### Great Use Cases
+
+- New App Features
+- App Management
+- Reviews
+- App Upgrades/Updates
+- Giveaways & Sweepstakes
+
+To see examples of in-app messages, check out our [Client Integration Gallery][53].
+
+### In-App Message Types
+
+Braze currently offers the following default in-app message types: [`Slideup`][13], [`Modal`][17], and [`Full`][41] and [`HTML`][42].  Each in-app message type is customizable across content, images, icons, click actions, analytics, display, and delivery.
+
+All in-app messages inherit their prototype from [`appboy.ab.InAppMessage`][2], which defines basic behavior and traits for all in-app messages. The protypical subclasses are [appboy.ab.SlideUpMessage][3], [appboy.ab.ModalMessage][6], [appboy.ab.FullScreenMessage][7], and [appboy.ab.HtmlMessage][12].
+
+### Expected Behaviors by Message Types
+
+These are what it looks like for your users to open one of our out-of-the-box in-app message types.
+
+{% tabs %}
+  {% tab Slideup %}
+
+  [`SlideUp`](https://js.appboycdn.com/web-sdk/latest/doc/ab.SlideUpMessage.html) in-app messages are so-named because traditionally on mobile platforms they "slide up" or "slide down" from the top or bottom of the screen. In the Braze Web SDK, these messages are actually displayed as more of a Growl or Toast style notification, to align with the web's dominant paradigm. They cover a small portion of the screen and provide an effective and non-intrusive messaging capability.
+  
+  <br>
+
+  ![Slideup Behavior]({% image_buster /assets/img/slideup-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+{% endtab %}
+{% tab Modal %}
+
+[`Modal`](https://js.appboycdn.com/web-sdk/latest/doc/ab.ModalMessage.html) in-app messages appear in the center of the screen and are framed by a translucent panel. Useful for more critical messaging, they can be equipped with up to two click action and analytics enabled buttons.
+
+  <br>
+
+  ![Modal Behavior]({% image_buster /assets/img/modal-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+{% endtab %}
+{% tab Full Screen %}
+
+[`Full`](https://js.appboycdn.com/web-sdk/latest/doc/ab.FullScreenMessage.html) in-app messages are useful for maximizing the content and impact of your user communication. On narrow browser windows (e.g. the mobile web), `full` in-app messages take up the entire browser window. On larger browser windows, `full` in-app messages appear similarly to `modal` in-app messages. The upper half of a `full` in-app message contains an image and the lower half allows up to eight lines of text as well as up to two click action and analytics enabled buttons
+
+<br>
+
+![Full-Screen Behavior]({% image_buster /assets/img/full-screen-behavior.gif %}){: style="border:0px;"}
+
+<br>
+
+{% endtab %}
+{% tab Custom HTML %}
+
+[`HTML`](https://js.appboycdn.com/web-sdk/latest/doc/ab.HtmlMessage.html) in-app messages are useful for creating fully customized user content. User-defined HTML is displayed in an iframe and may contain rich content, such as images, fonts, videos, and interactive elements, allowing for full control over message appearance and functionality. These support a Javascript `appboyBridge` interface to call methods on the Braze Web SDK from within your HTML, see [Best Practices]({{ site.baseurl }}/help/best_practices/in-app_messages/web_browsers_only/#web-html-messages) for more details.
+
+>  To enable HTML in-app messages, your SDK integration must supply the `enableHtmlInAppMessages` initialization option to Braze, e.g. `appboy.initialize('YOUR-API_KEY', {enableHtmlInAppMessages: true})`. This is for security reasons - HTML in-app messages can execute javascript so we require a site maintainer to enable them.
+
+The following example shows a paginated HTML in-app message:
+
+![HTML5 Example]({% image_buster /assets/img_archive/ios-html-full-iam.gif %})
+
+{% endtab %}
+{% endtabs %}
+
+
+
+[2]: https://js.appboycdn.com/web-sdk/latest/doc/ab.InAppMessage.html
+[3]: https://js.appboycdn.com/web-sdk/latest/doc/ab.SlideUpMessage.html
+[6]: https://js.appboycdn.com/web-sdk/latest/doc/ab.ModalMessage.html
+[7]: https://js.appboycdn.com/web-sdk/latest/doc/ab.FullScreenMessage.html
+[12]: https://js.appboycdn.com/web-sdk/latest/doc/ab.HtmlMessage.html
+[13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
+[17]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#modal-in-app-messages
+[41]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#full-in-app-messages
+[42]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#html-in-app-messages
+[47]: {% image_buster /assets/img_archive/In-App_Full.png %}
+[48]: {% image_buster /assets/img_archive/In-App_Modal.png %}
+[49]: {% image_buster /assets/img_archive/Web_Slideup.png %}
+[51]: {% image_buster /assets/img_archive/ios-html-full-iam.gif %}
+[52]: {{ site.baseurl }}/help/best_practices/in-app_messages/web_browsers_only/#web-html-messages
+[53]: {{ site.baseurl }}/help/best_practices/client_integration_gallery/#client-integration-iam
diff --git a/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/troubleshooting.md b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/troubleshooting.md
new file mode 100644
index 0000000000..507944e051
--- /dev/null
+++ b/_docs/_developer_guide/platform_integration_guides/web/in-app_messaging/troubleshooting.md
@@ -0,0 +1,8 @@
+---
+nav_title: Troubleshooting
+platform: Web
+page_order: 5
+search_rank: 5
+---
+
+{% include archive/troubleshooting_iams.md platform="Web" %}
diff --git a/_docs/_developer_guide/platform_integration_guides/web/in_app_messaging.md b/_docs/_developer_guide/platform_integration_guides/web/in_app_messaging.md
index 39036f7fd4..34cba907a6 100644
--- a/_docs/_developer_guide/platform_integration_guides/web/in_app_messaging.md
+++ b/_docs/_developer_guide/platform_integration_guides/web/in_app_messaging.md
@@ -6,7 +6,7 @@ search_rank: 5
 ---
 # In-App Messaging
 
-In-App Messages are great for creating unobtrusive calls to action, notifying people of new content in the News Feed and driving them toward it, or communicating with users who have push turned off. They are also effective for other content that isn't time-sensitive enough to warrant a push notification, or permanent enough to warrant a News Feed item. You can find a detailed explanation of in-app message behavior on [Braze Academy][4].
+In-App Messages are great for creating unobtrusive calls to action, notifying people of new content in the News Feed and driving them toward it, or communicating with users who have push turned off. They are also effective for other content that isn't time-sensitive enough to warrant a push notification, or permanent enough to warrant a News Feed item. You can find a detailed explanation of in-app message behavior on [our documentation][4].
 
 ## Integration
 
diff --git a/_docs/_developer_guide/platform_integration_guides/web/initial_sdk_setup.md b/_docs/_developer_guide/platform_integration_guides/web/initial_sdk_setup.md
index 6173a5b015..4699d23d72 100644
--- a/_docs/_developer_guide/platform_integration_guides/web/initial_sdk_setup.md
+++ b/_docs/_developer_guide/platform_integration_guides/web/initial_sdk_setup.md
@@ -10,7 +10,11 @@ Integrating the Braze SDK will provide you with basic analytics functionality as
 
 ## Step 1: Integrate the Braze Library
 
-To integrate the Braze Web SDK, simply follow the instructions in the "Getting Started" section of the [Braze Web SDK Github Repository][2]. Be sure to substitute the API key found within the "App Settings" page of the Braze dashboard for `YOUR-API-KEY-HERE`. For more detailed technical documentation, refer to [the complete JSDocs][9].
+To integrate the Braze Web SDK, follow the instructions in the "Getting Started" section of the [Braze Web SDK Github Repository][2].
+
+Substitute the API key found within the "App Settings" page (labeled "API Key" in the "Settings for ..." block) of your Braze account for `YOUR-API-KEY-HERE`. For more detailed technical documentation, refer to [the complete JSDocs][9].
+
+![API Key Location][14]
 
 If you have been provided a custom SDK endpoint, please include this in addition to your API key:
 
@@ -90,3 +94,4 @@ These files must be updated in coordination with each other to ensure proper fun
 [11]: {% image_buster /assets/img_archive/gtm_trigger.png %}
 [12]: {% image_buster /assets/img_archive/gtm_example.png %}
 [13]: https://github.com/appboy/appboy-web-sdk#alternative-google-tag-manager-installation
+[14]: {% image_buster /assets/img/api_key_location.png %}
diff --git a/_docs/_developer_guide/platform_integration_guides/windows_universal/analytics/setting_user_ids.md b/_docs/_developer_guide/platform_integration_guides/windows_universal/analytics/setting_user_ids.md
index 164df0f491..4d42cc3770 100644
--- a/_docs/_developer_guide/platform_integration_guides/windows_universal/analytics/setting_user_ids.md
+++ b/_docs/_developer_guide/platform_integration_guides/windows_universal/analytics/setting_user_ids.md
@@ -7,7 +7,7 @@ page_order: 1
 
 User IDs should be set for each of your users. These should be unchanging and accessible when a user opens the app. A database ID or a hashed email address/username is usually a good reference to use. We __strongly recommend__ providing this identifier as it will allow you to:
 
-- Track your users across devices and platforms, improving the quality of your behaviorial and demographic data.
+- Track your users across devices and platforms, improving the quality of your behavioral and demographic data.
 - Import data about your users using our [User Data API][1].
 - Target specific users with our [Messaging API][2] for both general and transactional messages.
 
diff --git a/_docs/_developer_guide/platform_wide/analytics_overview.md b/_docs/_developer_guide/platform_wide/analytics_overview.md
index 98b853c7d1..a636f3ea99 100644
--- a/_docs/_developer_guide/platform_wide/analytics_overview.md
+++ b/_docs/_developer_guide/platform_wide/analytics_overview.md
@@ -27,9 +27,9 @@ The following events and attributes are captured and updated automatically by th
 - Last Received Push Campaign (Date)
 - Last Viewed News Feed (Date)
 - Clicked Card (Integer)
-- Received Campaign
+- Received Message from Campaign
   - This filter allows you to target users based on their having (not) received a previous campaign.
-- Received Campaign with Tag
+- Received Message from Campaign with Tag
   - This filter allows you to target users based on their having (not) received a campaign that currently has a tag.
 - Retarget Campaign
   - This filter allows you to target users based on whether or not they have opened, or clicked on a specific email, push, or slideup in the past
@@ -105,7 +105,14 @@ String attributes are useful for storing user input, such as a favorite brand, a
 | Check if the string attribute __exists__ on a user's profile | __IS NOT BLANK__ | __N/A__ |
 | Check if the string attribute __does not exist__ on a user's profile | __IS BLANK__ | __N/A__ |
 
->  We use [Perl compatible regular expressions (PCRE)][11].
+{% alert tip %}
+For more on how to use our RegEx filter, check out this documentation on [Perl compatible regular expressions (PCRE)](http://www.regextester.com/pregsyntax.html).
+<br>
+More resources on RegEx:
+- [RegEx Tester and Debugger](https://regex101.com/)
+- [RegEx: Learn More](https://regexr.com/)
+- [RegEx Tutorial](https://medium.com/factory-mind/regex-tutorial-a-simple-cheatsheet-by-examples-649dc1c3f285)
+{% endalert %}
 
 #### Arrays
 Array attributes are good for storing related lists of information about your users. For example, storing the last 100 pieces of content a user watched within an array would allow specific interest segmentation.
@@ -260,7 +267,7 @@ Adding these attributes would afford you the ability to send campaigns to users
 
 User IDs should be set for each of your users. These should be unchanging and accessible when a user opens the app. We __strongly recommend__ providing this identifier as it will allow you to:
 
-- Track your users across devices and platforms, improving the quality of your behaviorial and demographic data.
+- Track your users across devices and platforms, improving the quality of your behavioral and demographic data.
 - Import data about your users using our [User Data API][9].
 - Target specific users with our [Messaging API][10] for both general and transactional messages.
 
diff --git a/_docs/_developer_guide/rest_api/api_network_connectivity_issues.md b/_docs/_developer_guide/rest_api/api_network_connectivity_issues.md
index c95ade77ae..590f534e22 100644
--- a/_docs/_developer_guide/rest_api/api_network_connectivity_issues.md
+++ b/_docs/_developer_guide/rest_api/api_network_connectivity_issues.md
@@ -38,6 +38,6 @@ To whitelist Braze's API endpoint through your firewall, our CDN provides
 access to the list of assigned IP ranges via a JSON dump. You can access the public list of Fastly IP ranges [here][3].
 
 
-[1]: https://helpdesk.privateinternetaccess.com/hc/en-us/articles/219333928-What-is-an-MTR-test-and-how-do-I-run-it
+[1]: https://www.privateinternetaccess.com/helpdesk/kb/articles/what-is-an-mtr-test-and-how-do-i-run-it
 [2]: http://www.fastly-debug.com/
 [3]: https://api.fastly.com/public-ip-list
diff --git a/_docs/_developer_guide/rest_api/basics.md b/_docs/_developer_guide/rest_api/basics.md
index ad7053ee4b..322931f1a8 100644
--- a/_docs/_developer_guide/rest_api/basics.md
+++ b/_docs/_developer_guide/rest_api/basics.md
@@ -12,7 +12,7 @@ Braze provides a high performance REST API to allow you to track users, send mes
 A REST API is a way to programmatically transfer information over the web using a predefined schema. Braze has created many different endpoints with specific requirements that will perform various actions and/or return various data. API access is done using HTTPS web requests to your company's REST API endpoint. Typically this is `https://rest.iad-01.braze.com`, but your Success Manager will provide an alternative endpoint URL if necessary.
 
 {% alert note %}
-Customers using Braze's EU database should use `https://rest.fra-01.braze.eu/`. For more information on REST API endpoints for customers using Braze's EU database see our [FAQs]({{ site.baseurl }}/developer_guide/rest_api/basics/#what-is-a-rest-api).
+Customers using Braze's EU database should use `https://rest.fra-01.braze.eu/`. For more information on REST API endpoints for customers using Braze's EU database see our [EU/US Implementation Differences documentation]({{ site.baseurl }}/developer_guide/eu01_us3_sdk_implementation_differences/overview/).
 {% endalert %}
 
 ## API Definitions
@@ -105,12 +105,13 @@ The `braze_id` serves as a unique user identifier that is set by Braze. This ide
 
 The Braze API infrastructure is designed to handle high volumes of data across our customer base. We enforce API rate limits in order to ensure responsible use of the API.
 
-|Initial API Rate Limit | Value|
+|Default API Rate Limit | Value|
 |---|---|
-|Requests of any kind (this does not include the `/users/track` endpoint)|250,000 per hour|
-|Requests to the Send endpoint specifying a Segment or Connected Audience|250 per minute|
-|Users modified per User Track request|75 Events, 75 Purchases, and 75 Attributes per API call|
-|Send Identifier Creation|100 per day|
+|Requests to the `/users/track` endpoint|Unlimited, though this is subject to change as noted below. |
+|Batching with the `/users/track` endpoint|75 Events, 75 Purchases, and 75 Attributes per API request. |
+|Requests to the Send endpoint specifying a Segment or Connected Audience|250 per minute. |
+|Send Identifier Creation|100 per day. |
+|Requests of any other kind|250,000 per hour. |
 
 {% alert warning %}
 API Rate Limits and their Values (limited or unlimited) are subject to change depending on proper usage of our system. We encourage sensible limits when making an API call to prevent damage or misuse.
@@ -118,7 +119,7 @@ API Rate Limits and their Values (limited or unlimited) are subject to change de
 
 REST API rate limit increases are considered based on need for customers who are making use of the API batching capabilities. Please batch requests to our API endpoints:
 
-- A single request to the User Track endpoint can contain Purchases, Custom Events and/or Custom Attribute updates for up to 75 users, specified by `external_id`
+- Each `/users/track` request can contain up to 75 Purchases, 75 Events and 75 Attribute updates. These can belong to different users, that is, each of the 75 Events in a request can belong to 75 different users.
 - A single request to the Messaging endpoints can reach any one of the following:
   - Up to 50 specific `external_ids`, each with individual message parameters
   - A segment of any size created in the Braze dashboard, specified by its `segment_id`
diff --git a/_docs/_developer_guide/rest_api/email_templates.md b/_docs/_developer_guide/rest_api/email_templates.md
index 5c7c9a61ee..64cd5add5b 100644
--- a/_docs/_developer_guide/rest_api/email_templates.md
+++ b/_docs/_developer_guide/rest_api/email_templates.md
@@ -78,14 +78,18 @@ EU-01 | `https://rest.fra-01.braze.eu/templates/email/list`
 
 ### Request Parameters
 
-```json
-{
-  “api_key”: (required, string) your App Group REST API Key
-  “modified_after”: (optional, string in ISO 8601), retrieve only templates updated at or after the given time
-  “modified_before”: (optional, string in ISO 8601), retrieve only templates updated at or before the given time
-  “limit”: (optional, positive number), maximum number of templates to retrieve, default to 100 if not provided, maximum acceptable value is 1000
-  “offset”: (optional, positive number), number of templates to skip before returning rest of the templates that fit the search criteria
-}
+| Parameter | Required | Data Type | Description |
+|---|---|---|---|
+| `api_key`  | Yes | String | Your App Group REST API Key. |
+| `modified_after`  | No | String in ISO 8601 | Retrieve only templates updated at or after the given time. |
+| `modified_before`  |  No | String in ISO 8601 | Retrieve only templates updated at or before the given time. |
+| `limit` | No | Positive Number | Maximum number of templates to retrieve, default to 100 if not provided, maximum acceptable value is 1000. |
+| `offset`  |  No | Positive Number | Number of templates to skip before returning rest of the templates that fit the search criteria. |
+
+### Example Request
+
+```
+https://rest.iad-01.braze.com/templates/email/list?api_key=123abc-def5-3729-owod-23f9f3j30
 ```
 
 ### Successful Response Properties
@@ -118,11 +122,15 @@ EU-01 | `https://rest.fra-01.braze.eu/templates/email/info`
 
 ### Request Parameters
 
-```json
-{
-  “api_key”: (required, string) your App Group REST API Key
-  “email_template_id”: (required, string) your email template’s API Identifier
-}
+| Parameter | Required | Data Type | Description |
+|---|---|---|---|
+| `api_key`  | Yes | String | Your App Group REST API Key. |
+| `email_template_id`  | Yes | String | Your email template’s API Identifier. |
+
+### Example Request
+
+```
+https://rest.iad-01.braze.com/templates/email/info?api_key=123abc-def5-3729-owod-23f9f3j30& email_template_id=759c2ad9-eefc-4af1-bde4-602630644935
 ```
 
 ### Successful Response Properties
diff --git a/_docs/_developer_guide/rest_api/export.md b/_docs/_developer_guide/rest_api/export.md
index 2b3db4e56c..d8dac1b834 100644
--- a/_docs/_developer_guide/rest_api/export.md
+++ b/_docs/_developer_guide/rest_api/export.md
@@ -124,7 +124,7 @@ Content-Type: application/json
 }
 ```
 
-The `segment_id` for a given segment can be found on our [Developer Console][13] within your dashboard or you can use the [Segment List Endpoint][5].
+The `segment_id` for a given segment can be found in your Developer Console within your Braze account or you can use the [Segment List Endpoint](#segment-list).
 
 {% alert warning %}
 Individual custom attributes cannot be exported. However, all custom attributes can be exported by including `custom_attributes` in the `fields_to_export` array (e.g. ['first_name', 'email', 'custom_attributes']).
@@ -346,7 +346,7 @@ This endpoint allows you to retrieve a daily series of the size of a segment ove
 | `length`     | Yes      | Integer                    | Max number of days before ending_at to include in the returned series - must be between 1 and 100 inclusive |
 | `ending_at`  | No       | DateTime (ISO 8601 string) | Point in time when the data series should end - defaults to time of the request                             |
 
-The `segment_id` for a given segment can be found on our [Developer Console][13] within your dashboard or you can use the [Segment List Endpoint][5].
+The `segment_id` for a given segment can be found in your Developer Console within your Braze account or you can use the [Segment List Endpoint](#segment-list).
 
 **Example URL:**
 `https://rest.iad-01.braze.com/segments/data_series?api_key=75480f9a-4db8-4057-8b7e-4d59bfd73709&segment_id=3bbc4555-8fa0-4c9b-a5c0-4505edf3e064&length=7&ending_at=2014-12-10T23:59:59-05:00`
@@ -388,7 +388,7 @@ This endpoint allows you to retrieve relevant information on the segment, which
 | `segment_id` | Yes      | String    | Segment API Identifier |
 
 {% alert tip %}
-    The `segment_id` for a given segment can be found on our [Developer Console][13] within your dashboard or you can use the [Segment List Endpoint][5].
+The `segment_id` for a given segment can be found in your Developer Console within your Braze account or you can use the [Segment List Endpoint](#segment-list).
 {% endalert %}
 
 **Example URL:**
@@ -480,7 +480,7 @@ This endpoint allows you to retrieve a daily series of various stats for a campa
 | `ending_at`   | No       | DateTime (ISO 8601 string) | Date on which the data series should end - defaults to time of the request                                  |
 
 {% alert tip %}
-The `campaign_id` for API campaigns can be found on the [Developer Console][13] page and the campaign details page within your dashboard; or you can use the [Campaign List Endpoint][8].
+The `campaign_id` for API campaigns can be found on the Developer Console page and the campaign details page within your dashboard; or you can use the [Campaign List Endpoint](#campaign-list-endpoint).
 {% endalert %}
 
 **Example URL:**
@@ -737,7 +737,7 @@ This endpoint allows you to retrieve relevant information on the campaign, which
 | `campaign_id` | Yes      | String    | Campaign API Identifier |
 
 {% alert tip %}
-The `campaign_id` for API campaigns can be found on the [Developer Console][13] page and the campaign details page within your dashboard or you can use the [Campaign List Endpoint][8].
+The `campaign_id` for API campaigns can be found on the Developer Console page and the campaign details page within your dashboard or you can use the [Campaign List Endpoint](#campaign-list-endpoint).
 {% endalert %}
 
 **Example URL:**
@@ -1222,7 +1222,7 @@ This endpoint allows you to retrieve a daily series of engagement stats for a ca
 | `ending_at` | No       | DateTime (ISO 8601 string) | Date on which the data series should end - defaults to time of the request                                                   |
 
 {% alert tip %}
-The `card_id` for a given card can be found in the [Developer Console][13] page and on the card details page within your dashboard or you can use the [News Feed List Endpoint][11].
+The `card_id` for a given card can be found in the Developer Console page and on the card details page within your dashboard or you can use the [News Feed List Endpoint](#news-feed-list).
 {% endalert %}
 
 **Example URL:**
@@ -1268,7 +1268,7 @@ This endpoint allows you to retrieve relevant information on the card, which can
 | `card_id` | Yes      | String    | Card API Identifier    |
 
 {% alert tip %}
-The `card_id` for a given card can be found in the [Developer Console][13] page and on the card details page within your dashboard or you can use the [News Feed List Endpoint][11].
+The `card_id` for a given card can be found in the Developer Console page and on the card details page within your dashboard or you can use the [News Feed List Endpoint](#news-feed-list).
 {% endalert %}
 
 **Example URL:**
@@ -1613,7 +1613,6 @@ The following status codes and associated error messages will be returned if you
 [10]: {{ site.baseurl }}/developer_guide/platform_integration_guides/unity/x_news_feed/#news-feed
 [11]: #news-feed-list
 [12]: #news-feed-analytics
-[13]: https://dashboard-01.braze.com/app_settings/developer_console/
 [14]: #sample-user-export-file-output
 [15]: #kpi
 [16]: #kpi-mau
diff --git a/_docs/_developer_guide/rest_api/messaging.md b/_docs/_developer_guide/rest_api/messaging.md
index 7da1a63107..0d88c9eaae 100644
--- a/_docs/_developer_guide/rest_api/messaging.md
+++ b/_docs/_developer_guide/rest_api/messaging.md
@@ -906,8 +906,8 @@ See the Windows Universal [toast template catalog][32] for details on the option
   "message_variation_id": (optional, string) used when providing a campaign_id to specify which message variation this message should be tracked under,
   "extras": (optional, valid Key-Value Hash), extra hash - for SendGrid customers, this will be passed to SendGrid as Unique Arguments,
   "headers": (optional, valid Key-Value Hash), hash of custom extensions headers. Currently, only supported for SendGrid customers,
-  "should_inline_css": (optional, boolean), whether to inline css on the body. If not provided, falls back to the defaullt css inlining value for the App Group,
-  "attachments": (optional, array), array of json objects like [{"file_name","url"}] to define the files you need attached. Do not provide the file name's extension, it will be detected automatically from the URL.
+  "should_inline_css": (optional, boolean), whether to inline css on the body. If not provided, falls back to the default css inlining value for the App Group,
+  "attachments": (optional, array), array of json objects like [{"file_name","url"}] that define the files you need attached. Your file name's extension will be detected automatically from the URL, which should return the appropriate `Content-Type` as a response header.
 }
 ```
 
diff --git a/_docs/_developer_guide/rest_api/postman_collection.md b/_docs/_developer_guide/rest_api/postman_collection.md
index 81191f4689..9b6be4f75a 100644
--- a/_docs/_developer_guide/rest_api/postman_collection.md
+++ b/_docs/_developer_guide/rest_api/postman_collection.md
@@ -15,7 +15,7 @@ Postman is a free-to-use visual editing tool for building and testing API reques
 
 ## Downloading Postman
 
-Postman has MacOS, Windows and Linux versions can be downloaded from their website located [here][1].
+Postman has MacOS, Windows, and Linux versions can be downloaded from their website located [here][1].
 
 ## Getting the Braze Postman Collection
 
@@ -29,13 +29,10 @@ The Braze Postman Collection can be added to your local Postman app by doing the
 
 The Braze Postman Collection uses a templating variable, `{{instanceURL}}`, to substitute the REST API URL of your Braze instance into the pre-built requests. Rather than having to manually edit all requests in the Collection, you can set up this variable in your Postman environment. To do so, please follow the steps below:
 
-1. Click on the gear icon in the top right corner of the Postman app:
-
-![Managing Environments][2]
-
+1. Click on the gear icon in the top right corner of the Postman app. ![Managing Environments][2]{: height="40%" width="40%"}
 2. Select "Manage Environments" to open a modal window which displays your active environments.
 3. In the bottom right corner of the modal window, click "Add" to create a new environment.
-4. Give this environment a name (e.g. "Braze API Requests") and add keys for `instance_url` and `api_key` with values corresponding to your Braze REST API URL and Braze REST API Key as pictured below. __Please note__ The `api_key` should be encapsulated in quotes.
+4. Give this environment a name (e.g. "Braze API Requests") and add keys for `instance_url` and `api_key` with values corresponding to your Braze REST API URL and Braze REST API Key as pictured below. The `api_key` should __not__ be encapsulated in quotes.
   - The value that you need to add for `instance_url` is dependent on your Braze instance. For more information, please see our [Rest API "Endpoint" documentation.][7]
   - For more information on your `api_key` please see our ["App Group REST API Key" documentation.][8]
 
diff --git a/_docs/_developer_guide/rest_api/subscription_group_api.md b/_docs/_developer_guide/rest_api/subscription_group_api.md
index 11606be4c3..baf40dff9c 100644
--- a/_docs/_developer_guide/rest_api/subscription_group_api.md
+++ b/_docs/_developer_guide/rest_api/subscription_group_api.md
@@ -20,22 +20,29 @@ US-04 | `https://rest.iad-04.braze.com/subscription/user/status`
 US-06 | `https://rest.iad-06.braze.com/subscription/user/status`
 EU-01 | `https://rest.fra-01.braze.eu/subscription/user/status`
 
-```json
+### Request Parameters
+
+```
 GET https://YOUR_REST_API_URL/subscription/user/status
-Content-Type: application/json
-{
-   "api_key": (required, string) your App Group REST API Key,
-   "external_id": (required, string) the external_id of the user,
-   "email_address": (required, string) the email address of the user (must include at least one address and at most 50 addresses)
-   "limit": (optional, integer) limit on the maximum number of results returned. Default (and max) limit is 100
-   "offset": (optional, integer) offset of returned result list. Default offset is 0. For example, if there are 230 users that matches API query, limit is set to 50, and offset is 0, the first 50 users will be returned in response. If offset is changed to 50, the next 50 users will be returned.
- }
 ```
 
+| Parameter | Required | Data Type | Description |
+|---|---|---|---|
+| `api_key`  | Yes | String | Your App Group REST API Key. |
+| `external_id`  | Yes | String | The external_id of the user. |
+| `email`  |  Yes | String | The email address of the user (must include at least one address and at most 50 addresses). |
+| `limit` | No | Integer | The limit on the maximum number of results returned. Default (and max) limit is 100. |
+| `offset`  |  No | Integer | Number of templates to skip before returning rest of the templates that fit the search criteria. |
+
 {% alert tip %}
 If there are multiple users (multiple external ids) who share the same email address, all users will be returned as a separate user (even if they have the same email address or subscription group).
 {% endalert %}
 
+### Example Request
+
+```
+https://rest.iad-03.braze.com/subscription/user/status?api_key=23abc-def5-3729-owod-23f9f3j30&email=example%2B1%40braze.com&subscription_group_id=14386d4a-60dd-42e2-9c94-5f2423b91d9f
+```
 
 ## Getting the Subscription Status
 
@@ -50,60 +57,21 @@ US-04 | `https://rest.iad-04.braze.com/subscription/status/get`
 US-06 | `https://rest.iad-06.braze.com/subscription/status/get`
 EU-01 | `https://rest.fra-01.braze.eu/subscription/status/get`
 
-```json
-GET https://YOUR_REST_API_URL/subscription/status/get
-Content-Type: application/json
-{
-   "api_key": (required, string) your App Group REST API Key,
-   "subscription_group_id": (required, string) the id of your subscription group,
-   "external_id": (required*, string) the external_id of the user,
-   "email_address": (required*, string) the email address of the user
-   //one of eternal_id or email_address is required
-   //can be passed as an array of string with a max of 100
- }
-```
-
-_Example of API call request based on email_address (shown broken out for documentation purposes only)_
+### Request Parameters
 
-```json
-GET https://YOUR_REST_API_URL/subscription/status/get?
-api_key=12345&
-subscription_group_id=111-222-333&
-email=bob%40bigburgers.com
-```
+| Parameter | Required | Data Type | Description |
+|---|---|---|---|
+| `api_key`  | Yes | String | Your App Group REST API Key. |
+| `subscription_group_id`  | Yes | String | The `id` of your subscription group. |
+| `external_id`  |  Yes* | String | The `external_id` of the user. |
+| `email` | Yes* | String | The email address of the user. Can be passed as an array of string with a max of 100. |
 
- _Example Response_
-
-```json
-Response: (status 200)
-{
-  "status": {
-    "bob@bigburgers.com": "unsubscribed"
-  },
-  "message": "success"
-}
-```
+_/* Either `external_id` or `email` are required._
 
-_Example of API call request based on external_id (shown broken out for documentation purposes only)_
+### Example Request
 
-```json
-Request:
-GET https://YOUR_REST_API_URL/subscription/status/get?
-api_key=12345&
-subscription_group_id=111-222-333&
-external_id=external-user-id-bob&
-external_id=external-user-id-john
 ```
-
-```json
-Response: (status 200)
-{
-  "status": {
-    "external-user-id-bob": "subscribed",
-    "external-user-id-john": "unknown"
-  },
-  "message": "success"
-}
+https://rest.iad-03.braze.com/subscription/user/status?api_key=23abc-def5-3729-owod-23f9f3j30&email=example%2B1%40braze.com
 ```
 
 ## Updating a Subscription State
@@ -125,10 +93,10 @@ Content-Type: application/json
 {
    "api_key": (required, string) your App Group REST API Key,
    "subscription_group_id": (required, string) the id of your subscription group,
-   "subscription_group_state": (required, string) available values are “unsubscribed” (not in subscription group) or “subscribed” (in subscription group),
+   "subscription_state": (required, string) available values are “unsubscribed” (not in subscription group) or “subscribed” (in subscription group),
    "external_id": (required*, string) the external_id of the user,
-   "email_address": (required*, string) the email address of the user
-   //one of eternal_id or email_address is required
+   "email": (required*, string) the email address of the user
+   //one of eternal_id or email is required
    //can be passed as an array of string with a max of 100
  }
 ```
diff --git a/_docs/_developer_guide/rest_api/user_data.md b/_docs/_developer_guide/rest_api/user_data.md
index 37bbeb9544..1a66323b1b 100644
--- a/_docs/_developer_guide/rest_api/user_data.md
+++ b/_docs/_developer_guide/rest_api/user_data.md
@@ -89,6 +89,7 @@ The following data types can be stored as a custom attribute:
 
 - Dates (Must be stored in the [ISO 8601][19] format or in the `yyyy-MM-dd'T'HH:mm:ss.SSSZ` format)
   - Date attributes without a timezone will default to Midnight UTC (and will be formatted on the dashboard as the equivalent of Midnight UTC in the company's timezone)
+  - Events and Attributes with timestamps in the future will default to the current time
 - Strings
 - Floats
 - Booleans
@@ -446,6 +447,8 @@ Content-Type: application/json
 }
 ```
 
+For more information on `alias_name` and `alias_label`, check out our [User Aliases documentation]({{ site.baseurl }}/user_guide/data_and_analytics/user_data_collection/user_profile_lifecycle/#user-aliases)
+
 [1]: {{ site.baseurl }}/developer_guide/rest_api/basics/#endpoints
 [6]: {{ site.baseurl }}/developer_guide/platform_wide/analytics_overview/#arrays
 [15]: {{ site.baseurl }}/user_guide/data_and_analytics/user_data_collection/overview/#user-data-collection
diff --git a/_docs/_help/best_practices/in-app_messages/in-app_message_behavior.md b/_docs/_help/best_practices/in-app_messages/in-app_message_behavior.md
index 955f9174eb..5543919815 100644
--- a/_docs/_help/best_practices/in-app_messages/in-app_message_behavior.md
+++ b/_docs/_help/best_practices/in-app_messages/in-app_message_behavior.md
@@ -1,39 +1,5 @@
 ---
-nav_title: In-App Message Behavior
-page_order: 5
+hidden: true
+layout: redirect
+redirect_to: /docs/message_building_by_channel/in-app_messages/overview
 ---
-
-# In-App Message Behavior
-
-## How to Create an In-App Message
-
-In-app messages are created on the dashboard in 3 ways: (1) messaging campaigns, (2) attached to news feed items and (3) the Messaging API.
-
-## In-App Message Delivery Rules
-
-With the move away from original in-app messages, Braze released support for in-app messages triggered off of specific actions. This allows for in-app messages to be delivered on any screen, any user session, or after any specific user action.  So long as a custom event is logged via the SDK, it can be used to trigger an in-app message at any point in a user flow.
-
-Messages are sent based on the start date/time that was listed in the campaign creator. If two in-app messages should be delivered at the same time, you can set a priority to determine the order in which the messages should display.
-
-![Priority][20]
-
-[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[5]: {% image_buster /assets/img_archive/inappexample.png %}
-[7]: {{ site.baseurl }}/help/faqs/
-[8]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/#manually-queue-in-app-message-display
-[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
-[10]: {% image_buster /assets/img_archive/braze_fullscreen.png %}
-[11]: {% image_buster /assets/img_archive/braze_modal.png %}
-[12]: {% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %}
-[13]: {% image_buster /assets/img_archive/braze_campaigndetails.png %}
-[14]: {% image_buster /assets/img_archive/web-email-capture.png %}
-[15]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/scheduling_and_organizing/scheduling_your_campaign/#action-based-delivery-event-triggered-campaigns
-[16]: {% image_buster /assets/img_archive/braze_customhtml.png %}
-[17]: {% image_buster /assets/img_archive/HTML5.gif %}
-[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
-[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
-[20]: {% image_buster /assets/img_archive/braze_campaignpriority.png %}
-[21]: {{ site.baseurl }}/help/best_practices/push/#creating-custom-opt-in-prompts
-[22]: https://github.com/Appboy/appboy-custom-html5-in-app-message-templates
-[23]: https://www.picsart.com?abButtonId=0
-[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/in-app_messages/in-app_message_specs.md b/_docs/_help/best_practices/in-app_messages/in-app_message_specs.md
index 12df2bc2d0..72b4395a08 100644
--- a/_docs/_help/best_practices/in-app_messages/in-app_message_specs.md
+++ b/_docs/_help/best_practices/in-app_messages/in-app_message_specs.md
@@ -1,59 +1,5 @@
 ---
-nav_title: In-App Message Specs
-page_order: 4
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/previous_in-app_message_generations/#specs
 ---
-
-# In-App Message Specs
-
-## Character and Image Limits:
-
-| Type                               | Aspect Ratio | Recommended Image Size | Max Image Size |   File Types  | Max Character Count |
-|------------------------------------|:------------:|:----------------------:|:--------------:|:-------------:|:-------------------:|
-| Portrait Full Screen (With Text)   |      5:4     |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
-| Portrait Full Screen (Image Only)  |     10:16    |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
-| Landscape Full Screen (With Text)  |     16:5     |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
-| Landscape Full Screen (Image Only) |     16:10    |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
-| Slideup                            |      1:1     |          500KB         |       5MB      | PNG, JPG, GIF |         140         |
-| Modal (Image Only)                 |      1:1     |          500KB         |       5MB      | PNG, JPG, GIF |         140         |
-| Modal (With Text)                  |     29:10    |          500KB         |       5MB      | PNG, JPG, GIF |         140         |
-
-
-## Keeping In-App Message File Sizes Small
-
-Braze recommends you keep your images, and HTML assets zips as small as possible for several reasons:
-
-- Smaller HTML & image message payloads will download faster, and display more quickly and reliably for your customers.
-- Smaller HTML & image message payloads will keep your customer's data costs down as well. Braze in-app messages are downloaded in the background on session start so they can be triggered in real-time based upon whatever criteria you select. As a result, if you have 10 HTML in-app messages of 1MB each, your customers would all incur 10MB of data charges even if they never triggered all of those messages. This can add up quickly over time, even though the in-app messages are cached and not re-downloaded session to session.
-
-The following strategies are helpful for keeping file sizes down:
-
-- Reference fonts embedded in your application / website to customize your HTML in-app messages rather than including the font files in your HTML asset zip folder.
-- Ensure no extraneous or duplicative CSS or JS are included in your HTML asset zips.
-- Use [ImageOptim][25] on all images to compress images to their minimum possible size with no reduction in quality.
-
-### iPhone 5 Specs:
-![iPhone 5 Specs][18]
-
-### iPhone 6 Specs:
-![iPhone 6 Specs][19]
-
-[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[5]: {% image_buster /assets/img_archive/inappexample.png %}
-[7]: {{ site.baseurl }}/help/faqs/
-[8]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/#manually-queue-in-app-message-display
-[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
-[10]: {% image_buster /assets/img_archive/braze_fullscreen.png %}
-[11]: {% image_buster /assets/img_archive/braze_modal.png %}
-[12]: {% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %}
-[13]: {% image_buster /assets/img_archive/braze_campaigndetails.png %}
-[14]: {% image_buster /assets/img_archive/web-email-capture.png %}
-[15]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/scheduling_and_organizing/scheduling_your_campaign/#action-based-delivery-event-triggered-campaigns
-[16]: {% image_buster /assets/img_archive/braze_customhtml.png %}
-[17]: {% image_buster /assets/img_archive/HTML5.gif %}
-[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
-[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
-[20]: {% image_buster /assets/img_archive/braze_campaignpriority.png %}
-[21]: {{ site.baseurl }}/help/best_practices/push/#creating-custom-opt-in-prompts
-[22]: https://github.com/Appboy/appboy-custom-html5-in-app-message-templates
-[23]: https://www.picsart.com?abButtonId=0
-[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/in-app_messages/native_apps_only.md b/_docs/_help/best_practices/in-app_messages/native_apps_only.md
index 969dce86b9..edf6c69357 100644
--- a/_docs/_help/best_practices/in-app_messages/native_apps_only.md
+++ b/_docs/_help/best_practices/in-app_messages/native_apps_only.md
@@ -1,91 +1,5 @@
 ---
-nav_title: Native (Apps Only)
-page_order: 2
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/previous_in-app_message_generations/
 ---
-
-# Native (Apps Only)
-
-## Custom HTML Message {#native-html-messages}
-While Braze’s out-of-the box in-app messages can be customized in a variety of ways, you can gain even greater control over the look and feel of your campaigns using messages designed and built using HTML5. With some simple composition, you can unlock custom functionality and branding to match any of your needs.
-
-![HTML5 In App Message][16]
-
-Select the “Custom HTML” message type in your in-app message campaign composer. From here, you’ll see a field to input the HTML for your custom in-app message, as well as a file uploader section. This uploader accepts zipped files that should include all of the assets your HTML references (fonts, images, styles, etc.). Since the assets file and HTML code are uploaded separately, it should not be expected that the HTML will automatically populate per asset file upload. Also, as we do not currently support a preview of your HTML in-app messages, we recommend sending yourself a test HTML message before launching this type of campaign to your users.
-
-HTML5 in-app messages allow for greater control over the look and feel of a message, and anything supported by HTML5 is also supported by Braze. For example, Soundcloud uses HTML5 in-app messages to conduct a user satisfaction survey:
-
-![HTML5 Gif][17]
-
-### JavaScript Bridge (appboyBridge)
-
-From iOS version `2.29.0` and Android version `2.0.0`, HTML in-app messages support a Javascript "bridge" interface to the Braze SDK, allowing you to trigger custom Braze actions when users click on elements with links or otherwise engage with your content. The following javascript methods are supported in Braze's HTML in-app messages:
-
-{% include archive/appboyBridge.md platform="native" %}
-
-### Link-Based Actions
-
-HTML in-app messages can trigger custom Braze actions when users click on elements with links. The supported link schemes are:
-
-Supported Scheme | Corresponding Action | Supported Query Strings
---- | --- |---
-Normal Web URL or Deep Linking | For web URLs, Braze will open the new content of the link in a webview within your app by default, or in an external browser when query `abExternalOpen` is true. The HTML5 in-app message will be dismissed before opening the link. For deep linking, Braze will open your URL regardless of the value of `abExternalOpen`. | `abExternalOpen` and `abButtonId`
-`appboy://close` | Braze will dismiss the HTML in-app message. | None
-`appboy://feed` | Braze will dismiss the HTML in-app message and display a modal News Feed. | `abButtonId`
-`appboy://customEvent` | Braze will log a custom event and will NOT dismiss the HTML in-app message. | `name`<br>All additional queries will be set as properties of the custom event.
-
-### Supported Query Strings
-
-You can customize your link actions by appending the optional URL query strings below to your HTTP(S) link:
-
-Query String Name | Value | Action
------------|-------|-------
-`abButtonId` | `{0,1}` | Braze will use the value specified as the button's ID for analytics tracking<br>([https://www.picsart.com?abButtonId=0][23]) *
-`name` | Arbitrary string | This represents the custom event name for use with `appboy://customEvent` (e.g., `appboy://customEvent?name=eventName`).
-`abExternalOpen` | `{true, false}` | When this query string parameter is absent or set to `false`, Braze will try to open the web link in an internal web browser inside the host app. To have Braze open the web link in an external web browser, set this parameter to `true`.
-`abDeepLink` | `{true, false}` | When this query string parameter is absent or set to `false`, Braze will try to open the web link in an internal web browser inside the host app. To have Braze handle your HTTP(S) link as a deep link, set this parameter to `true`.
-
-Analytics tracking is enabled by default for all links that have the `abButtonId` query (see above). A link with `abButtonId=0` will be represented as Button 1 on the Dashboard, while a link with `abButtonId=1` will be represented as Button 2.
-
-
-Examples:
-
-- `appboy://close`
-	- sample close button: `<a href="appboy://close">Close</a>`
-- `appboy://feed?abButtonId=0`
-- `appboy://customEvent?name=eventName&property1=value1&property2=value2`
-	- This would log an event called `eventName` with the properties `property1`=`value1` and `property2`=`value2`.
-
-If you are interested in customizing your in-app messages, please make sure your design or development team is aware of these parameters.
-
-### HTML5 In-App Message Templates
-
-We've designed a set of six HTML5 in-app messages templates to help you get started. Check out our [Github repository][22] which contains detailed instructions on how to use and customize these templates for your needs.
-
-### Customizable Features
-
-- Fonts
-- Styles
-- Images + Videos
-- On-click behaviors
-- Interactive Components
-
-[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[5]: {% image_buster /assets/img_archive/inappexample.png %}
-[7]: {{ site.baseurl }}/help/faqs/
-[8]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/#manually-queue-in-app-message-display
-[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
-[10]: {% image_buster /assets/img_archive/braze_fullscreen.png %}
-[11]: {% image_buster /assets/img_archive/braze_modal.png %}
-[12]: {% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %}
-[13]: {% image_buster /assets/img_archive/braze_campaigndetails.png %}
-[14]: {% image_buster /assets/img_archive/web-email-capture.png %}
-[15]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/scheduling_and_organizing/scheduling_your_campaign/#action-based-delivery-event-triggered-campaigns
-[16]: {% image_buster /assets/img_archive/braze_customhtml.png %}
-[17]: {% image_buster /assets/img_archive/HTML5.gif %}
-[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
-[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
-[20]: {% image_buster /assets/img_archive/braze_campaignpriority.png %}
-[21]: {{ site.baseurl }}/help/best_practices/push/#creating-custom-opt-in-prompts
-[22]: https://github.com/Appboy/appboy-custom-html5-in-app-message-templates
-[23]: https://www.picsart.com?abButtonId=0
-[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/in-app_messages/overview.md b/_docs/_help/best_practices/in-app_messages/overview.md
index 48a1aa075c..b07e573ae2 100644
--- a/_docs/_help/best_practices/in-app_messages/overview.md
+++ b/_docs/_help/best_practices/in-app_messages/overview.md
@@ -1,42 +1,5 @@
 ---
-nav_title: Overview
-page_order: 0
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/prep_guide/
 ---
-# In-App Messages
-
-With the ability to leverage multiple in-app message formats, you can choose a layout that best suits your content and campaign goal. Because these formats look and interact with your users differently, they are best suited for different use cases.
-
-## Best Practices {#in-app-best-practices}
-
-- This type of message is best for users who regularly visiting your app, as your audience will only see the greeting when the app is opened.
-- Compared to an email correspondence or News Feed card, an in-app message generally appears for a set amount of time, so the text should be concise.
-- They can be particularly effective in driving feature discovery, encouraging and rewarding discovery or upselling via in-app purchases.
-- Add [protocol URLs][1] to direct your audience to another part of your app and personalize their experience.
-- For in-app messages containing an image, Braze improves load times by using a global CDN to host the image.
-- In-app messages are great for priming users to accept a permission request (i.e. [push priming][21]).
-- The aspect ratio of images are maintained and fill whichever dimension that we hit the boundary for first. No part of the image that is positioned within the image safe zone will be cropped. We recommend that images fit on a 16:10 screen, which means:
-  - A portrait fullscreen with text: 5:4 image
-  - Portrait fullscreen (with image only): 10:16 image
-  - Landscape fullscreen with test: 16:5 image
-  - Landscape fullscreen (image only): 16:10 image
-
-[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[5]: {% image_buster /assets/img_archive/inappexample.png %}
-[7]: {{ site.baseurl }}/help/faqs/
-[8]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/#manually-queue-in-app-message-display
-[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
-[10]: {% image_buster /assets/img_archive/braze_fullscreen.png %}
-[11]: {% image_buster /assets/img_archive/braze_modal.png %}
-[12]: {% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %}
-[13]: {% image_buster /assets/img_archive/braze_campaigndetails.png %}
-[14]: {% image_buster /assets/img_archive/web-email-capture.png %}
-[15]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/scheduling_and_organizing/scheduling_your_campaign/#action-based-delivery-event-triggered-campaigns
-[16]: {% image_buster /assets/img_archive/braze_customhtml.png %}
-[17]: {% image_buster /assets/img_archive/HTML5.gif %}
-[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
-[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
-[20]: {% image_buster /assets/img_archive/braze_campaignpriority.png %}
-[21]: {{ site.baseurl }}/help/best_practices/push/creating_custom_opt-in_prompts/#creating-custom-opt-in-prompts
-[22]: https://github.com/Appboy/appboy-custom-html5-in-app-message-templates
-[23]: https://www.picsart.com?abButtonId=0
-[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/in-app_messages/prep_guide.md b/_docs/_help/best_practices/in-app_messages/prep_guide.md
new file mode 100644
index 0000000000..4207592257
--- /dev/null
+++ b/_docs/_help/best_practices/in-app_messages/prep_guide.md
@@ -0,0 +1,39 @@
+---
+nav_title: Prep Guide
+page_order: 0.5
+---
+
+# Prep Guide
+
+Before you start building your in-app message, you should consider a few of the following topics so building your message is quick and easy.
+
+## General Considerations
+
+- If you are building in Campaigns, how many variants of this message would you like to display?
+- If you are building in Canvas, will this message be paired with other messaging channels in that step?
+- When would you like [your message to expire]({{ site.baseurl }}/canvas_in-app_messages/)?
+
+## Targeting Considerations
+- In-app messages are best for users who regularly visit your app, are you including this audience?
+- Where do you want your users to meet your message? In your Web app? In your mobile app?
+- Which event triggers this message?
+- Are any of your users using older versions of your app? If so, they might not be able to see some elements of your message. Learn more [here]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/generations/).
+- What type of device or devices are you building this message for? Remember, you can preview your message using [our Preview box or Test tab]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/testing/).
+
+## Content Considerations
+- Which languages will you be using in this message?
+- What is your Header and Body copy? Are they eye-catching and relevant to your user?
+- Is your copy concise and memorable, as in-app messages only appear for a set amount of time?
+- Will you be using [Liquid]({{ site.baseurl }}/user_guide/personalization_and_dynamic_content/liquid/using_liquid/) to build more custom copy?
+- Is your image or other media within the [Safe Zone]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creative_details/)?
+
+
+## Conversion Considerations
+- What is your goal for this message? How can you represent that in your message?
+- Do your button options offer options that make sense to your user? What is your [primary call to action]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/#buttons)?
+- Are you [deep-linking to other in-app content][1]? Are you using this in-app message to send and accept a [permission or push priming request][21]?
+- Do you have a message exit option? If not, you can always copy and paste this snippet to create a quick button: `<a href="appboy://close">X</a>` .
+
+
+[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
+[21]: {{ site.baseurl }}/help/best_practices/push/creating_custom_opt-in_prompts/#creating-custom-opt-in-prompts
diff --git a/_docs/_help/best_practices/in-app_messages/previous_in-app_message_generations.md b/_docs/_help/best_practices/in-app_messages/previous_in-app_message_generations.md
new file mode 100644
index 0000000000..3528665f30
--- /dev/null
+++ b/_docs/_help/best_practices/in-app_messages/previous_in-app_message_generations.md
@@ -0,0 +1,159 @@
+---
+nav_title: Previous Generations
+page_order: 20
+---
+
+# Message Type Details
+
+{% alert important %}
+This section reviews previous information around our in-app messages. To see the most up-to date information on our current in-app message generation, see our [new in-app message overview documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/overview/).
+{% endalert %}
+
+## Universal
+
+This will review previous information around our in-app messages. To see the most up-to date information on our current in-app message generation, see our [in-app message overview documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/overview/).
+
+
+{% details Full-Screen %}
+These are the most engaging, but also the most intrusive since they cover your user’s entire screen. They are great for displaying large, rich images, and can be useful in conveying very important information, such as crucial new features and expiring promotions. Since they are more disruptive of the user experience, use these sparingly for top priority content.
+
+![Full-Screen Message]({% image_buster /assets/img_archive/braze_fullscreen.png %})
+
+__Customizable Features__
+
+- Header and body text
+- A large image
+- Up to two call to action buttons with separate on click behavior and deep links
+- Different colors for the header and body text, buttons and background
+- Key-value pairs
+
+{% enddetails %}
+{% details  Modal %}
+These messages aren’t as intrusive as full-screen messages, as they still allow users to see part of your app’s UI. Since they still contain buttons and images, modal messages may be a better option than slideups if you desire a more interactive, visual campaign. These are great for medium priority content, such as app updates and non-urgent deals and events.
+
+![Modal Message]({% image_buster /assets/img_archive/braze_modal.png %})
+
+__Customizable Features__
+
+- Header and body text
+- An image or customizable badge icon
+- Up to two call to action buttons with separate on click behavior and deep links
+- Different colors for the header and body text, buttons and background
+- Key-value pairs
+
+{% enddetails %}
+
+{% details Traditional Slideup %}
+These are the least intrusive message type, though they can be more or less attention-grabbing depending on your usage of colors and badge icons. This may be the message format to use when onboarding new users and directing them towards particular in-app features, as they don’t pause the app experience and allow for continuous exploration.
+
+![Slideup Message]({% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %})
+
+__Customizable Features__
+
+- Body text
+- An image or customizable badge icon
+- Different colors for slideup background, text and icon
+- Message close behavior
+- Slideup position (top or bottom of the app screen)
+- Key-value pairs
+
+{% enddetails %}
+
+<br>
+
+## Web
+
+This will review previous information around more customized in-app messages. To see the most up-to date information on our current in-app message generation, see our [Customization documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/).
+
+{% details Email Capture Message %}
+Email capture messages allow you to easily prompt users of your site to submit their email address, after which it will be available within the Braze system for use in all your messaging campaigns.
+
+![Email Capture Message]({% image_buster /assets/img_archive/web-email-capture.png %})
+
+>  To enable Email Capture in-app messages, your SDK integration must supply the `enableHtmlInAppMessages` initialization option to Braze, e.g. `appboy.initialize('YOUR-API_KEY', {enableHtmlInAppMessages: true})`. This is for security reasons - HTML in-app messages can execute javascript so we require a site maintainer to enable them.
+
+__Customizable Features__
+
+- Header, body, and submit button text
+- An optional image
+- An optional "Terms of Service" link
+- Different colors for the header and body text, buttons and background
+- Key-value pairs
+
+{% enddetails %}
+
+{% details Custom HTML Message %}
+
+While Braze’s out-of-the box in-app messages can be customized in a variety of ways, you can gain even greater control over the look and feel of your campaigns using messages designed and built using HTML, CSS, and Javascript. With some simple composition, you can unlock custom functionality and branding to match any of your needs. HTML in-app messages allow for greater control over the look and feel of a message, and anything supported by HTML5 is also supported by Braze.
+
+__JavaScript Bridge (appboyBridge)__
+
+HTML in-app messages support a Javascript "bridge" interface to the Braze Web SDK, allowing you to trigger custom Braze actions when users click on elements with links or otherwise engage with your content. The following javascript methods are supported in Braze's HTML in-app messages:
+
+{% include archive/appboyBridge.md platform="web" %}
+
+Additionally, for analytics tracking, any `<a>` or `<button>` elements in your HTML will automatically log a "click" action to the campaign associated with the in-app message. To log a "button click" instead of a "body click," either provide a query string value of abButtonId on your link's href (e.g. `<a href="http://mysite.com?abButtonId=0">click me</a>`), or provide an id on the HTML element (e.g. `<a id="0" href="http://mysite.com">click me</a>`). Note that the only button ids currently accepted are "0" and "1." A link with a button id of 0 will be represented as "Button 1" on the Dashboard, while a link with a button id of 1 will be represented as "Button 2."
+
+>  To enable HTML in-app messages, your SDK integration must supply the `enableHtmlInAppMessages` initialization option to Braze: for example `appboy.initialize('YOUR-API_KEY', {enableHtmlInAppMessages: true})`. This is for security reasons - HTML in-app messages can execute javascript so we require a site maintainer to enable them.
+
+{% enddetails %}
+
+{% details HTML In App-Message Templates %}
+
+We've designed a set of HTML5 in-app messages templates to help you get started. Check out our [Github repository](https://github.com/Appboy/appboy-custom-html5-in-app-message-templates) which contains detailed instructions on how to use and customize these templates for your needs.
+
+__Customizable Features__
+
+- Fonts
+- Styles
+- Images + Videos
+- On-click behaviors
+- Interactive Components
+
+{% enddetails %}
+
+<br>
+
+# Specs
+
+This will review previous information around our in-app message creative specifications. To see the most up-to date information on our current in-app message generation, see our [Creative Specs documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creative_details/).
+
+
+## Character and Image Limits:
+
+| Type                               | Aspect Ratio | Recommended Image Size | Max Image Size |   File Types  | Max Character Count |
+|------------------------------------|:------------:|:----------------------:|:--------------:|:-------------:|:-------------------:|
+| Portrait Full Screen (With Text)   |      5:4     |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
+| Portrait Full Screen (Image Only)  |     10:16    |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
+| Landscape Full Screen (With Text)  |     16:5     |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
+| Landscape Full Screen (Image Only) |     16:10    |          500KB         |       5MB      | PNG, JPG, GIF |         240         |
+| Slideup                            |      1:1     |          500KB         |       5MB      | PNG, JPG, GIF |         140         |
+| Modal (Image Only)                 |      1:1     |          500KB         |       5MB      | PNG, JPG, GIF |         140         |
+| Modal (With Text)                  |     29:10    |          500KB         |       5MB      | PNG, JPG, GIF |         140         |
+
+
+## Keeping In-App Message File Sizes Small
+
+Braze recommends you keep your images, and HTML assets zips as small as possible for several reasons:
+
+- Smaller HTML & image message payloads will download faster, and display more quickly and reliably for your customers.
+- Smaller HTML & image message payloads will keep your customer's data costs down as well. Braze in-app messages are downloaded in the background on session start so they can be triggered in real-time based upon whatever criteria you select. As a result, if you have 10 HTML in-app messages of 1MB each, your customers would all incur 10MB of data charges even if they never triggered all of those messages. This can add up quickly over time, even though the in-app messages are cached and not re-downloaded session to session.
+
+The following strategies are helpful for keeping file sizes down:
+
+- Reference fonts embedded in your application / website to customize your HTML in-app messages rather than including the font files in your HTML asset zip folder.
+- Ensure no extraneous or duplicative CSS or JS are included in your HTML asset zips.
+- Use [ImageOptim][25] on all images to compress images to their minimum possible size with no reduction in quality.
+
+### iPhone 5 Specs:
+![iPhone 5 Specs][18]
+
+### iPhone 6 Specs:
+![iPhone 6 Specs][19]
+
+
+[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
+
+[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
+
+[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/in-app_messages/reporting.md b/_docs/_help/best_practices/in-app_messages/reporting.md
index 7015c95aa0..4858b2f2dc 100644
--- a/_docs/_help/best_practices/in-app_messages/reporting.md
+++ b/_docs/_help/best_practices/in-app_messages/reporting.md
@@ -1,42 +1,5 @@
 ---
-nav_title: Reporting
-page_order: 7
+hidden: true
+layout: redirect
+redirect_to: /docs/user_guide/message_building_by_channel/in-app_messages/reporting/
 ---
-# Reporting {#IAM-Reporting}
-
-In the details for an in-app message campaign, you can find detailed performance statistics. Below is an example campaign statistics page.
-
-![Campaign Details][13]
-
-It is important to understand the significance of and difference between the Current Audience, Unique Recipients, and Impressions.
-
-- Current Audience refers to the number of users eligible to receive the message based on segmentation filters and [triggers][15] you set up in the campaign. A user would be counted multiple times in the Current Audience if they receive the campaign more than once.
-- Unique Recipients represents the number of users whose SDK has received the message. As in-app messages are not delivered to the user until a new session is started, this number will climb up from zero as users in the Current Audience open the app.
-- Impressions are the number of users whose devices have reported that the message has been displayed.
-
-For an example of how Current Audience and Unique Recipients differ, imagine an in-app message campaign targeting a segment with 15K users. At the moment the campaign is launched, the Current Audience would be 15K. After an hour, if 5K users from the segment have started a new session, the number of Unique Recipients would only be 5K.
-
-Impressions and Unique Recipients should be very similar numbers, however they can differ if you have customized the time in-app messages are displayed, in which case the impression can be recorded after the start of a new session, or if some users have recorded an impression but closed the app before the impression was sent to our servers, so the impression will be logged during their next session.
-
-Previously, Unique Recipients were defined similarly to Current Audience. As Unique Recipients are used as the denominator for the conversion rate, conversion rates for current campaigns may be higher than those in older campaigns.
-
-[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[5]: {% image_buster /assets/img_archive/inappexample.png %}
-[7]: {{ site.baseurl }}/help/faqs/
-[8]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/#manually-queue-in-app-message-display
-[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
-[10]: {% image_buster /assets/img_archive/braze_fullscreen.png %}
-[11]: {% image_buster /assets/img_archive/braze_modal.png %}
-[12]: {% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %}
-[13]: {% image_buster /assets/img_archive/braze_campaigndetails.png %}
-[14]: {% image_buster /assets/img_archive/web-email-capture.png %}
-[15]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/scheduling_and_organizing/scheduling_your_campaign/#action-based-delivery-event-triggered-campaigns
-[16]: {% image_buster /assets/img_archive/braze_customhtml.png %}
-[17]: {% image_buster /assets/img_archive/HTML5.gif %}
-[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
-[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
-[20]: {% image_buster /assets/img_archive/braze_campaignpriority.png %}
-[21]: {{ site.baseurl }}/help/best_practices/push/#creating-custom-opt-in-prompts
-[22]: https://github.com/Appboy/appboy-custom-html5-in-app-message-templates
-[23]: https://www.picsart.com?abButtonId=0
-[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/in-app_messages/universal_apps_and_browsers.md b/_docs/_help/best_practices/in-app_messages/universal_apps_and_browsers.md
index c7f623e39b..5f9b259bd7 100644
--- a/_docs/_help/best_practices/in-app_messages/universal_apps_and_browsers.md
+++ b/_docs/_help/best_practices/in-app_messages/universal_apps_and_browsers.md
@@ -1,67 +1,5 @@
 ---
-nav_title: Universal (Apps & Browsers)
-page_order: 1
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/previous_in-app_message_generations/#universal
 ---
-
-# Universal (Apps & Browsers)
-
-## Full-Screen
-These are the most engaging, but also the most intrusive since they cover your user’s entire screen. They are great for displaying large, rich images, and can be useful in conveying very important information, such as crucial new features and expiring promotions. Since they are more disruptive of the user experience, use these sparingly for top priority content.
-
-![Full-Screen Message][10]
-
-### Customizable Features
-
-- Header and body text
-- A large image
-- Up to two call to action buttons with separate on click behavior and deep links
-- Different colors for the header and body text, buttons and background
-- Key-value pairs
-
-## Modal
-These messages aren’t as intrusive as full-screen messages, as they still allow users to see part of your app’s UI. Since they still contain buttons and images, modal messages may be a better option than slideups if you desire a more interactive, visual campaign. These are great for medium priority content, such as app updates and non-urgent deals and events.
-
-![Modal Message][11]
-
-### Customizable Features
-
-- Header and body text
-- An image or customizable badge icon
-- Up to two call to action buttons with separate on click behavior and deep links
-- Different colors for the header and body text, buttons and background
-- Key-value pairs
-
-## Traditional Slideup
-These are the least intrusive message type, though they can be more or less attention-grabbing depending on your usage of colors and badge icons. This may be the message format to use when onboarding new users and directing them towards particular in-app features, as they don’t pause the app experience and allow for continuous exploration.
-
-![Slideup Message][12]
-
-### Customizable Features
-
-- Body text
-- An image or customizable badge icon
-- Different colors for slideup background, text and icon
-- Message close behavior
-- Slideup position (top or bottom of the app screen)
-- Key-value pairs
-
-[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[5]: {% image_buster /assets/img_archive/inappexample.png %}
-[7]: {{ site.baseurl }}/help/faqs/
-[8]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/#manually-queue-in-app-message-display
-[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
-[10]: {% image_buster /assets/img_archive/braze_fullscreen.png %}
-[11]: {% image_buster /assets/img_archive/braze_modal.png %}
-[12]: {% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %}
-[13]: {% image_buster /assets/img_archive/braze_campaigndetails.png %}
-[14]: {% image_buster /assets/img_archive/web-email-capture.png %}
-[15]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/scheduling_and_organizing/scheduling_your_campaign/#action-based-delivery-event-triggered-campaigns
-[16]: {% image_buster /assets/img_archive/braze_customhtml.png %}
-[17]: {% image_buster /assets/img_archive/HTML5.gif %}
-[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
-[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
-[20]: {% image_buster /assets/img_archive/braze_campaignpriority.png %}
-[21]: {{ site.baseurl }}/help/best_practices/push/#creating-custom-opt-in-prompts
-[22]: https://github.com/Appboy/appboy-custom-html5-in-app-message-templates
-[23]: https://www.picsart.com?abButtonId=0
-[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/in-app_messages/use_cases.md b/_docs/_help/best_practices/in-app_messages/use_cases.md
index bb6aceb627..46989df0b3 100644
--- a/_docs/_help/best_practices/in-app_messages/use_cases.md
+++ b/_docs/_help/best_practices/in-app_messages/use_cases.md
@@ -1,20 +1,5 @@
 ---
-nav_title: Use Cases
-page_order: 6
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/overview/#great-use-cases
 ---
-
-# Use Cases {#in-app-use-cases}
-
-Simple and quick no-action-required messages are best sent via in-app messages.
-
-## Examples
-
-- Quick tour of new app features.
-- [Request a review.][26]
-- Welcoming users back after a long absence.
-- Reminding users of where they left off in a given game.
-- Quick announcements (e.g., "Patriots are Super Bowl Champions!")
-- Personalized, thoughtful notices (“Merry Christmas,” “Happy Birthday” etc.)
-- Prime users to accept a push prompt.
-
-[26]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/in-app_message_templates/#custom-app-store-review-prompt
diff --git a/_docs/_help/best_practices/in-app_messages/web_browsers_only.md b/_docs/_help/best_practices/in-app_messages/web_browsers_only.md
index af6ac356fc..9be2d0aa9f 100644
--- a/_docs/_help/best_practices/in-app_messages/web_browsers_only.md
+++ b/_docs/_help/best_practices/in-app_messages/web_browsers_only.md
@@ -1,68 +1,5 @@
 ---
-nav_title: Web (Browsers Only)
-page_order: 3
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/previous_in-app_message_generations/#web
 ---
-
-# Web (Browsers Only)
-
-## Email Capture Message
-Email capture messages allow you to easily prompt users of your site to submit their email address, after which it will be available within the Braze system for use in all your messaging campaigns.
-
-![Email Capture Message][14]
-
->  To enable Email Capture in-app messages, your SDK integration must supply the `enableHtmlInAppMessages` initialization option to Braze, e.g. `appboy.initialize('YOUR-API_KEY', {enableHtmlInAppMessages: true})`. This is for security reasons - HTML in-app messages can execute javascript so we require a site maintainer to enable them.
-
-### Customizable Features
-
-- Header, body, and submit button text
-- An optional image
-- An optional "Terms of Service" link
-- Different colors for the header and body text, buttons and background
-- Key-value pairs
-
-## Custom HTML Message {#web-html-messages}
-
-While Braze’s out-of-the box in-app messages can be customized in a variety of ways, you can gain even greater control over the look and feel of your campaigns using messages designed and built using HTML, CSS, and Javascript. With some simple composition, you can unlock custom functionality and branding to match any of your needs. HTML in-app messages allow for greater control over the look and feel of a message, and anything supported by HTML5 is also supported by Braze.
-
-### JavaScript Bridge (appboyBridge)
-
-HTML in-app messages support a Javascript "bridge" interface to the Braze Web SDK, allowing you to trigger custom Braze actions when users click on elements with links or otherwise engage with your content. The following javascript methods are supported in Braze's HTML in-app messages:
-
-{% include archive/appboyBridge.md platform="web" %}
-
-Additionally, for analytics tracking, any `<a>` or `<button>` elements in your HTML will automatically log a "click" action to the campaign associated with the in-app message. To log a "button click" instead of a "body click," either provide a query string value of abButtonId on your link's href (e.g. `<a href="http://mysite.com?abButtonId=0">click me</a>`), or provide an id on the HTML element (e.g. `<a id="0" href="http://mysite.com">click me</a>`). Note that the only button ids currently accepted are "0" and "1." A link with a button id of 0 will be represented as "Button 1" on the Dashboard, while a link with a button id of 1 will be represented as "Button 2."
-
->  To enable HTML in-app messages, your SDK integration must supply the `enableHtmlInAppMessages` initialization option to Braze: for example `appboy.initialize('YOUR-API_KEY', {enableHtmlInAppMessages: true})`. This is for security reasons - HTML in-app messages can execute javascript so we require a site maintainer to enable them.
-
-### HTML In App-Message Templates
-
-We've designed a set of HTML5 in-app messages templates to help you get started. Check out our [Github repository][22] which contains detailed instructions on how to use and customize these templates for your needs.
-
-### Customizable Features
-
-- Fonts
-- Styles
-- Images + Videos
-- On-click behaviors
-- Interactive Components
-
-[1]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[5]: {% image_buster /assets/img_archive/inappexample.png %}
-[7]: {{ site.baseurl }}/help/faqs/
-[8]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/#manually-queue-in-app-message-display
-[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#slideup-in-app-messages
-[10]: {% image_buster /assets/img_archive/braze_fullscreen.png %}
-[11]: {% image_buster /assets/img_archive/braze_modal.png %}
-[12]: {% image_buster /assets/img_archive/stopwatch_slideup_IAM.gif %}
-[13]: {% image_buster /assets/img_archive/braze_campaigndetails.png %}
-[14]: {% image_buster /assets/img_archive/web-email-capture.png %}
-[15]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/scheduling_and_organizing/scheduling_your_campaign/#action-based-delivery-event-triggered-campaigns
-[16]: {% image_buster /assets/img_archive/braze_customhtml.png %}
-[17]: {% image_buster /assets/img_archive/HTML5.gif %}
-[18]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_05.png %}
-[19]: {% image_buster /assets/img_archive/In-AppMsg_Mockups+Specs_06.png %}
-[20]: {% image_buster /assets/img_archive/braze_campaignpriority.png %}
-[21]: {{ site.baseurl }}/help/best_practices/push/#creating-custom-opt-in-prompts
-[22]: https://github.com/Appboy/appboy-custom-html5-in-app-message-templates
-[23]: https://www.picsart.com?abButtonId=0
-[25]: https://imageoptim.com/
diff --git a/_docs/_help/best_practices/push/push_subscription_status.md b/_docs/_help/best_practices/push/push_subscription_status.md
index 7352e75ca9..a1bb7c2440 100644
--- a/_docs/_help/best_practices/push/push_subscription_status.md
+++ b/_docs/_help/best_practices/push/push_subscription_status.md
@@ -1,92 +1,4 @@
 ---
-nav_title: Push Subscription Status
-page_order: 9
+layout: redirect
+redirect_to: /docs/user_guide/message_building_by_channel/push/users_and_subscriptions/
 ---
-
-# Push Subscription Status
-
-For a user to receive your messages through push, they must be Subscribed or Opted-In **AS WELL AS** Push Registered.
-
-## Subscribed, Opted-In, and Unsubscribed
-
-For **iOS**: A user has to explicitly opt-in to receive push notifications to their device after being prompted by the app.<br>
-
-![opt-in][56]
-
-For **Android**: no explicit opt-in is required to send users push notifications. When a user is registered for push on Android, they are set to subscribed.  An Android user must explicitly unsubscribe to push to stop receiving notifications.<br>
-
-![subscribed][57]
-
-For **Both**: the unsubscribed setting applies to those users who have unsubscribed from previously receiving push notifications.
-
-## Where Does Push Registered Come Into Play?
-
-A user is "Push Registered" if they have an active push token for an app in your app group.
-
-On the User Engagement tab in the dashboard you will see: “**Push Registered For**” followed by an **App Name(s)** or followed by **No Apps**. There will be an entry for every device that belongs to the user.
-
-<img width="329" alt="screen shot 2017-04-20 at 10 47 35 am" src="https://cloud.githubusercontent.com/assets/20304883/25244744/cd16d324-25b6-11e7-9d7c-d37b74690cf8.png">
-
-If the device entry's app name is prefixed by `Foreground:`, the app is authorized to receive both foreground push notifications (visible to the user) and background push notifications (not visible to the user) on that device.
-
-On the other hand, if the device entry's app name is prefixed by `Background:`, the app is only authorized to receive background push and can not display user-visible notifications on that device. This usually indicates the user has disabled notifications for the app on that device.
-
-If a push token is moved a different user on the same device, that first user will no longer be push registered.
-
-<img width="263" alt="screen shot 2017-04-20 at 10 48 29 am" src="https://cloud.githubusercontent.com/assets/20304883/25244775/ec6e0ae4-25b6-11e7-846d-4bf8f38c3057.png">
-
-## Push Enabled
-
-A Push enabled user is one who both is registered and subscribed/opted-in. This term is also used as a filter in our dashboard to target users who actually can receive messages.
-
-To be specific, users who are "**push enabled is true**" have an active push token for their device, are Opted-In/Subscribed and are push registered so they can currently receive push notifications to their device..
-Subsequently, "**push enabled is false**" means the user does not currently have a push token, are unsubscribed or not push registered and therefore will not receive a push campaign in their current state.
-
-![push enabled][58]
-
-[3]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/deep_linking_to_in-app_content/#deep-linking-to-in-app-content
-[4]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/setting_custom_attributes/
-[5]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/setting_custom_attributes/#setting-custom-attributes
-[6]: {{ site.baseurl }}/developer_guide/platform_integration_guides/windows_universal/analytics/setting_custom_attributes/
-[10]: {{ site.baseurl }}/developer_guide/rest_api/user_data/#user-attributes-object-specification
-[13]: {{ site.baseurl }}/help/best_practices/spam_regulations/#can-spam
-[14]: {% image_buster /assets/img_archive/circa_push1.png %}
-[15]: {% image_buster /assets/img_archive/circa_push2.png %}
-[16]: {% image_buster /assets/img_archive/bn_push1.png %}
-[17]: {% image_buster /assets/img_archive/bn_push2.png %}
-[19]: {{ site.baseurl }}/help/best_practices/email/#email-sunset-policies
-[23]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/ideas_and_strategies/capturing_lapsing_users/#capturing-lapsing-users
-[24]: {% image_buster /assets/img_archive/textplus_prompt.png %}
-[25]: {% image_buster /assets/img_archive/textplus_reminder.png %}
-[26]: {% image_buster /assets/img_archive/textplus_directions.png %}
-[27]: {% image_buster /assets/img_archive/android_push_img2.png %}
-[29]: {% image_buster /assets/img_archive/braze_campaignresults.png %}
-[30]: {% image_buster /assets/img_archive/Push_Reporting_Campaign_Statistics.png %}
-[31]: {% image_buster /assets/img_archive/Push_Reporting_iOS_Push_Metric.png %}
-[32]: {% image_buster /assets/img_archive/Push_Reporting_Message_Deliveries.png %}
-[34]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/testing_and_more/conversion_events/#conversion-events
-[35]: {{ site.baseurl }}/user_guide/data_and_analytics/influenced_opens/#influenced-opens
-[36]: {{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#managing-user-subscriptions
-[37]: {% image_buster /assets/img_archive/PushPrimeFandango.png %}
-[38]: #bounced-push-notifications
-[39]: https://developers.google.com/cloud-messaging/
-[40]: https://www.braze.com/blog/breakdown-android-lollipops-new-notification-priorities-push-flexibility/
-[41]: {% image_buster /assets/img_archive/braze_default.png %}
-[42]: {% image_buster /assets/img_archive/iOS_push_notification_small.png %}
-[43]: {% image_buster /assets/img_archive/Push_Android_2.png %}
-[44]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/push_notifications/
-[45]: https://developer.apple.com/library/ios/documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/BackgroundExecution/BackgroundExecution.html
-[46]:{% image_buster /assets/img_archive/Push_Window8_Toast.png %}
-[47]:{% image_buster /assets/img_archive/Push_Windows_Universal_Toast.png %}
-[48]: {{ site.baseurl }}/user_guide/data_and_analytics/influenced_opens/#influenced-opens
-[49]: https://medium.com/@hopper_travel/the-notification-problem-50267cbabad2#.auax13q52
-[50]: http://developer.android.com/design/patterns/notifications.html
-[51]: http://developer.android.com/design/patterns/notifications.html
-[52]: {% image_buster /assets/img_archive/braze_category.png %}
-[53]: {% image_buster /assets/img_archive/braze_visibility.png %}
-[54]: {% image_buster /assets/img_archive/braze_richpush1.png %}
-[55]: {% image_buster /assets/img_archive/braze_richpush2.png %}
-[56]: {% image_buster /assets/img_archive/braze_optedin.png %}
-[57]: {% image_buster /assets/img_archive/braze_subscribed.png %}
-[58]: {% image_buster /assets/img_archive/braze_pushenabled.png %}
-[59]: {{ site.baseurl }}/user_guide/message_building_by_channel/push/creating_a_push_message/#creating-a-push-message
diff --git a/_docs/_help/best_practices/web_sdk.md b/_docs/_help/best_practices/web_sdk.md
index 3b5f9b608c..585842e44c 100644
--- a/_docs/_help/best_practices/web_sdk.md
+++ b/_docs/_help/best_practices/web_sdk.md
@@ -45,7 +45,7 @@ This will allow you to target users based on their behavior on the web only. If
 [1]: https://developer.mozilla.org/en-us/docs/web/api/push_api#browser_compatibility
 [2]: https://developer.microsoft.com/en-us/microsoft-edge/platform/status/pushapi/
 [3]: https://developer.apple.com/notifications/safari-push-notifications/
-[6]: {{ site.baseurl }}/help/best_practices/web_sdk/
+[6]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/initial_sdk_setup/
 [7]: {% image_buster /assets/img_archive/web-app-group.png %}
 [8]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#creating-an-in-app-message
 [9]: {% image_buster /assets/img_archive/appboy-web-inapp-message.png %}
diff --git a/_docs/_help/gdpr_compliance.md b/_docs/_help/gdpr_compliance.md
index 90212f8f98..017c3901ea 100644
--- a/_docs/_help/gdpr_compliance.md
+++ b/_docs/_help/gdpr_compliance.md
@@ -65,7 +65,7 @@ The right to erasure is also known as 'the right to be forgotten'.
 
 Braze offers two solutions to stop additional processing of data by Braze:
 
-* The Braze SDKs allow customers to disable all Braze operations. This will prevent all data from being sent to Braze from that website or application. The Braze Documentation provides detailed instructions on how to disable the SDK on the platform-specific documentation pages ([iOS]({{ site.baseurl }}/developer_guide/Platform_Integration_Guides/iOS/Initial_SDK_Setup/), [Android]({{ site.baseurl }}/developer_guide/Platform_Integration_Guides/Android/Initial_SDK_Setup/), and [Web]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/initial_sdk_setup/)).
+* The Braze SDKs allow customers to disable all Braze operations. This will prevent all data from being sent to Braze from that website or application. The Braze Documentation provides detailed instructions on how to disable the SDK on the platform-specific documentation pages ([iOS]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/initial_sdk_setup/), [Android]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration/), and [Web]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/initial_sdk_setup/)).
 * Alternatively, you can recommend that your Users uninstall or logout from any and all of your Applications that use the Braze SDK.
 
 Once you have halted data collection, you can use Braze’s [User Deletion REST API endpoint]({{ site.baseurl }}/developer_guide/rest_api/user_data/#user-delete-endpoint) to delete an end user, which will remove all records of such end user from the Braze’s Services:
diff --git a/_docs/_help/help_articles/campaigns_and_canvas/canvas_not_sending.md b/_docs/_help/help_articles/campaigns_and_canvas/canvas_not_sending.md
index 8988951c0a..b5844f8158 100644
--- a/_docs/_help/help_articles/campaigns_and_canvas/canvas_not_sending.md
+++ b/_docs/_help/help_articles/campaigns_and_canvas/canvas_not_sending.md
@@ -34,4 +34,4 @@ The [Entry Settings]({{ site.baseurl }}/user_guide/engagement_tools/canvas/creat
 Users may also drop out of a Canvas if they are no longer eligible to receive messages. For example, if the Canvas only contained push notifications, and a user opted out of push after receiving the First Step - that user would drop out of the Canvas. Consider preempting this by using branching to add in alternative user journeys.
 
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/) or review our comprehensive [Canvas documentation]({{ site.baseurl }}/user_guide/engagement_tools/canvas/create_a_canvas/create_a_canvas/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/) or review our comprehensive [Canvas documentation]({{ site.baseurl }}/user_guide/engagement_tools/canvas/create_a_canvas/create_a_canvas/).
diff --git a/_docs/_help/help_articles/campaigns_and_canvas/conversions_low.md b/_docs/_help/help_articles/campaigns_and_canvas/conversions_low.md
index 286fd01c2c..5b6596e4fb 100644
--- a/_docs/_help/help_articles/campaigns_and_canvas/conversions_low.md
+++ b/_docs/_help/help_articles/campaigns_and_canvas/conversions_low.md
@@ -25,7 +25,7 @@ For each conversion event that you select per campaign, you set the [deadline][4
 
 Please ensure you’ve reviewed Braze's information on [calculating conversions][45] in order to understanding your campaign metrics.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [1]: {{ site.baseurl }}/user_guide/data_and_analytics/your_reports/understanding_your_app_usage_data/#understanding-your-app-usage-data
 [2]: {{ site.baseurl }}/user_guide/data_and_analytics/configuring_reporting/#configuring-reporting
diff --git a/_docs/_help/help_articles/campaigns_and_canvas/locations_data_in_campaigns.md b/_docs/_help/help_articles/campaigns_and_canvas/locations_data_in_campaigns.md
index 743ed6452a..0c4b55127b 100644
--- a/_docs/_help/help_articles/campaigns_and_canvas/locations_data_in_campaigns.md
+++ b/_docs/_help/help_articles/campaigns_and_canvas/locations_data_in_campaigns.md
@@ -30,7 +30,7 @@ Confirm that your developers are passing location data to Braze. Normally the pa
 - [iOS][27]
 - [Web][28]
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [25]: {% image_buster /assets/img_archive/trouble7.png %}
 [26]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/location_tracking/
diff --git a/_docs/_help/help_articles/campaigns_and_canvas/more_people_in_control_group.md b/_docs/_help/help_articles/campaigns_and_canvas/more_people_in_control_group.md
index 6c7dfc9678..82122abceb 100644
--- a/_docs/_help/help_articles/campaigns_and_canvas/more_people_in_control_group.md
+++ b/_docs/_help/help_articles/campaigns_and_canvas/more_people_in_control_group.md
@@ -43,7 +43,7 @@ If we look back to the Entry Audience (active users), we can see that even thoug
 
 This means that even though we specified 90% of users to enter the variant, not all of those users are actually **able to** receive a push notification. This means that those users will not be able to enter the variant and will default to the control group.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [1]: {{site.baseurl }}/user_guide/engagement_tools/canvas/create_a_canvas/create_a_canvas/#step-2-use-the-entry-wizard-to-set-up-your-canvas
 [41]: {% image_buster /assets/img_archive/trouble15.png %}
diff --git a/_docs/_help/help_articles/campaigns_and_canvas/not_triggering.md b/_docs/_help/help_articles/campaigns_and_canvas/not_triggering.md
index d6f67e6f95..9580d21ef1 100644
--- a/_docs/_help/help_articles/campaigns_and_canvas/not_triggering.md
+++ b/_docs/_help/help_articles/campaigns_and_canvas/not_triggering.md
@@ -18,7 +18,7 @@ If your campaign is triggering off of a custom event, you will want to make sure
 
 For example, if the Segment includes the event Session Start “Has Used App more than once” and the event the campaign triggers off of is Session Start, the user will receive the message, it just won’t necessarily be for the first session. This is because the first step when checking to see if a user should receive a campaign is reviewing the segment target audience. 
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 
 [1]: {{ site.baseurl }}/user_guide/engagement_tools/segments/using_user_search/#overview-tab
diff --git a/_docs/_help/help_articles/campaigns_and_canvas/using_custom_event_properties.md b/_docs/_help/help_articles/campaigns_and_canvas/using_custom_event_properties.md
index 44294ab5e3..dcd9c65621 100644
--- a/_docs/_help/help_articles/campaigns_and_canvas/using_custom_event_properties.md
+++ b/_docs/_help/help_articles/campaigns_and_canvas/using_custom_event_properties.md
@@ -36,7 +36,7 @@ To confirm that the event properties are successfully tracked, you can view all
 
 To check the specific property values that are being passed for each event, check the [Event User Logs][24] on your dashboard. After adding your user as a test user, you should perform the Custom Event within the App, wait around 10 seconds for the data to flush, and then refresh the event user log to view the custom event and the event property value that was passed with it.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [22]: {{ site.baseurl }}/user_guide/data_and_analytics/custom_data/custom_events/#custom-event-properties
 [23]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/analytics/tracking_custom_events/
diff --git a/_docs/_help/help_articles/campaigns_and_canvas/using_event_logging.md b/_docs/_help/help_articles/campaigns_and_canvas/using_event_logging.md
index 570c34adef..3a3f1fe7ad 100644
--- a/_docs/_help/help_articles/campaigns_and_canvas/using_event_logging.md
+++ b/_docs/_help/help_articles/campaigns_and_canvas/using_event_logging.md
@@ -21,7 +21,7 @@ Use Event Logging to test what behavior looks like for an anonymous user. It can
 
 This is a great way to find anonymous users. You can also use this information to test what data is being sent to Braze and check any discrepancies. From this view you are also able to identify whether the deltas of your data are being sent to Braze. If an email address or push token is being sent with every event logged that indicates that all data is being sent to Braze.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [46]: {{ site.baseurl }}/user_guide/administrative/app_settings/developer_console/event_user_log_tab/#event-user-log-tab
 [51]: {{ site.baseurl }}/user_guide/administrative/app_settings/developer_console/internal_groups_tab/#adding-test-users
diff --git a/_docs/_help/help_articles/docs/contribution.md b/_docs/_help/help_articles/docs/contribution.md
index 6a13c4c998..1eab2bc2c3 100644
--- a/_docs/_help/help_articles/docs/contribution.md
+++ b/_docs/_help/help_articles/docs/contribution.md
@@ -15,5 +15,5 @@ You, too can contribute to this documentation. If you have a unique perspective
 You can find the Braze Docs repo [here](https://github.com/Appboy/braze-docs/).
 
 {% alert important %}
-Before making changes to Braze Docs, you will be asked to sign our [Consumer License Agreement (CLA)]({{ site.baseurl }}/cla)
+Before making changes to Braze Docs, you will be asked to sign our [Contributor License Agreement (CLA)]({{ site.baseurl }}/cla)
 {% endalert %}
diff --git a/_docs/_help/help_articles/docs/scroll_bar_overlap.md b/_docs/_help/help_articles/docs/scroll_bar_overlap.md
index 3fa4a78867..afa599c6a1 100644
--- a/_docs/_help/help_articles/docs/scroll_bar_overlap.md
+++ b/_docs/_help/help_articles/docs/scroll_bar_overlap.md
@@ -30,7 +30,7 @@ It might help you on other sites, too!
 
 {% comment %}
 Insert this where there is a single line of long code that might cause issues:
-_Can't see the code because of the scroll bar? See how to fix that [here]({{ site.baseurl }}/help/help_articles_docs/scroll_bar_overlap/)._
+_Can't see the code because of the scroll bar? See how to fix that [here]({{ site.baseurl }}/help/help_articles/docs/scroll_bar_overlap/)._
 {% endcomment %}
 
 [1]: {% image_buster /assets/img/scroll-overlap.png %}
diff --git a/_docs/_help/help_articles/email/html_looks_strange.md b/_docs/_help/help_articles/email/html_looks_strange.md
index 111e21334c..2cee38b5c5 100644
--- a/_docs/_help/help_articles/email/html_looks_strange.md
+++ b/_docs/_help/help_articles/email/html_looks_strange.md
@@ -36,7 +36,7 @@ Emails render differently on different browsers and email clients. Record which
 
 There are times when the preview in Email on Acid or Litmus still does not match what is sent via the Braze dashboard. One possible cause for this is the CSS in-lining that is performed by Braze may differ from the CSS in-lining performed by other tools. If you suspect that this is the case, contact your BRaze account manager to ask for CSS in-lining to be turned off.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/), or leave feedback below.
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/), or leave feedback below.
 
 [1]: {{ site.baseurl }}/user_guide/engagement_tools/segments/using_user_search/#overview-tab
 [2]: {% image_buster /assets/img_archive/trouble1.png %}
diff --git a/_docs/_help/help_articles/in-app_messages/in-app_message_impressions_appear_lower_than_expected.md b/_docs/_help/help_articles/in-app_messages/in-app_message_impressions_appear_lower_than_expected.md
index 8c84147739..c4a2dc5ed1 100644
--- a/_docs/_help/help_articles/in-app_messages/in-app_message_impressions_appear_lower_than_expected.md
+++ b/_docs/_help/help_articles/in-app_messages/in-app_message_impressions_appear_lower_than_expected.md
@@ -16,7 +16,7 @@ If your impressions are lower than you'd like them to be, we recommend you...
 
 It’s important to ensure that your Segment size in the Campaign reflects your intended audience. Perhaps there are filters applied limiting your audience and causing your campaign to have fewer impressions.
 
-## Segment Changelogs 
+## Segment Changelogs
 
 If the impression count is low compared to where it once was, make sure no one unintentionally altered the Segment or Campaign since launch. Our Segment and Campaign changelogs will give you insight into changes that have been made, who made the change, and when it happened.
 
@@ -39,10 +39,10 @@ If the campaign is triggered by a Session Start or a Custom Event, you will want
 Customization of the In-App Message UI or delivery mechanisms within the SDK may require your developers to utilize our methods to manually log In-App message impressions. Check with your developers to see if you use In-App message customization.
 
 You can read more about this:
-  * [iOS][12] In-App message documentation
-  * [Android][13] In-App message documentation
+  * [iOS][12] In-app message documentation
+  * [Android][13] In-app message documentation
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 
 [10]: {% image_buster /assets/img_archive/trouble4.png %}
diff --git a/_docs/_help/help_articles/in-app_messages/in-app_messages_not_displaying.md b/_docs/_help/help_articles/in-app_messages/in-app_messages_not_displaying.md
index 5826f1ea48..f9b381f28d 100644
--- a/_docs/_help/help_articles/in-app_messages/in-app_messages_not_displaying.md
+++ b/_docs/_help/help_articles/in-app_messages/in-app_messages_not_displaying.md
@@ -1,5 +1,5 @@
 ---
-nav_title: In-App messages not displaying
+nav_title: In-App Messages Not Displaying
 page_order: 2
 ---
 
@@ -33,7 +33,7 @@ Alternatively try using a different type of In-App message template or size of i
 
 ## Session Timeout
 
-Find out if you have customized your session timeout. By default, Braze retrieves In-App messages at the start of a session from the server. 
+Find out if you have customized your session timeout. By default, Braze retrieves In-App messages at the start of a session from the server.
 
 If you have an extended the session timeout it will extended the period of time from which we can refresh the potential In-App messages you are eligible for. Additionally, if your campaign is set to trigger off of a session start, you’ll need to make sure the appropriate amount of time has passed for a new session to be registered. For example, the session timeout may have been customized to be 30 seconds. If you open and close the App in less than 30 seconds you will not be eligible to receive another In-App message triggered on session start. You can read more about that for:
 
@@ -46,11 +46,11 @@ If you have an extended the session timeout it will extended the period of time
 There is a minimum interval at which we’ll allow In-App messages to be consecutively triggered. You might be trying to trigger them too quickly. Review our documentation for more information on this:
 * [iOS][19]
 * [Android][20]
-* [Web][21] 
+* [Web][21]
 
 These are customizable, however we have them in place to avoid over-messaging your users.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [14]: {% image_buster /assets/img_archive/trouble6.png %}
 [15]: {{ site.baseurl }}help/best_practices/in-app_messages/in-app_message_specs/
diff --git a/_docs/_help/help_articles/push/no_push_notification_was_received.md b/_docs/_help/help_articles/push/no_push_notification_was_received.md
index 806feccd5d..beab4ff2aa 100644
--- a/_docs/_help/help_articles/push/no_push_notification_was_received.md
+++ b/_docs/_help/help_articles/push/no_push_notification_was_received.md
@@ -44,7 +44,7 @@ If this is a single channel Campaign or a Canvas with a control group, it’s po
   * Check the [distribution][6] to see if there is a control group.
   * Additionally, create a segment [using this filter][7], and [export the segment][8] and see if your user ID is on this list.
 
-  Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+  Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 
 [1]: {{ site.baseurl }}/user_guide/engagement_tools/segments/using_user_search/#engagement-tab
diff --git a/_docs/_help/help_articles/segments/my_filter_options_have_changed.md b/_docs/_help/help_articles/segments/my_filter_options_have_changed.md
index a2c84450e9..316dc836c8 100644
--- a/_docs/_help/help_articles/segments/my_filter_options_have_changed.md
+++ b/_docs/_help/help_articles/segments/my_filter_options_have_changed.md
@@ -12,7 +12,7 @@ If your filter options have changed, this is an indication that your data is bei
 
 Please note that changing the data type of a Custom Attribute in the dashboard will reject data that is being sent to Braze in a different format.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 
 [1]: {{ site.baseurl }}/user_guide/engagement_tools/segments/using_user_search/#overview-tab
diff --git a/_docs/_help/help_articles/segments/segment_showing_0_users.md b/_docs/_help/help_articles/segments/segment_showing_0_users.md
index c9920230fd..51804b0300 100644
--- a/_docs/_help/help_articles/segments/segment_showing_0_users.md
+++ b/_docs/_help/help_articles/segments/segment_showing_0_users.md
@@ -25,7 +25,7 @@ It is possible that the data you are filtering on is not being sent to Braze. To
 The data that you see in the Braze dashboard might not have the identical syntax as what you are sending to Braze. Ensure that these two match exactly.
 {% endalert %}
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [1]: {{ site.baseurl }}/user_guide/engagement_tools/segments/using_user_search/#overview-tab
 [2]: {% image_buster /assets/img_archive/trouble1.png %}
diff --git a/_docs/_help/help_articles/segments/segmentation_logic_with_and_or.md b/_docs/_help/help_articles/segments/segmentation_logic_with_and_or.md
index 4c1d7f18df..2ad0288248 100644
--- a/_docs/_help/help_articles/segments/segmentation_logic_with_and_or.md
+++ b/_docs/_help/help_articles/segments/segmentation_logic_with_and_or.md
@@ -39,7 +39,7 @@ Finally, look at the example below where we are using both the **AND** and **OR*
 
 Another way to ensure you’re building the right logic, is to create your segment and [preview the users][35] who are falling into it based on your filters. This way, you can make sure that their attributes, App version, or any other segmentation matches what you are seeing.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [1]: {{ site.baseurl }}/user_guide/engagement_tools/segments/using_user_search/#overview-tab
 [2]: {% image_buster /assets/img_archive/trouble1.png %}
diff --git a/_docs/_help/help_articles/segments/segmentation_logic_with_negative_or_filters.md b/_docs/_help/help_articles/segments/segmentation_logic_with_negative_or_filters.md
index e415765252..53d731c6be 100644
--- a/_docs/_help/help_articles/segments/segmentation_logic_with_negative_or_filters.md
+++ b/_docs/_help/help_articles/segments/segmentation_logic_with_negative_or_filters.md
@@ -41,7 +41,7 @@ Because there are no valid use cases for using "Or" operands with two or more ne
 
 If you received this warning message and aren't sure how to correct your campaign, canvas or segment, please get in touch with your Customer Success Manager or write to our support team.
 
-Still need help? [Open a support ticket]({{ site.baseurl }}/docs/support_contact/).
+Still need help? [Open a support ticket]({{ site.baseurl }}/support_contact/).
 
 [1]: {{ site.baseurl }}/user_guide/engagement_tools/segments/using_user_search/#overview-tab
 [2]: {% image_buster /assets/img_archive/trouble1.png %}
diff --git a/_docs/_help/release_notes/2016/december.md b/_docs/_help/release_notes/2016/december.md
index 3248f672a9..bc5c14db72 100644
--- a/_docs/_help/release_notes/2016/december.md
+++ b/_docs/_help/release_notes/2016/december.md
@@ -13,5 +13,5 @@ Email headers add the explicit setting of email headers through the send endpoin
 
 With this update, you can make one step connect to multiple steps, or have multiple steps connect into a single, merged step, as well as draw connection points between them. For example, users who have made a purchase may follow a different flow from users who have not. For more information about Canvas, visit the Canvas section under dashboard features [here][15].
 
-[14]: {{ site.baseurl }}/help/troubleshooting_guide/troubleshooting_guide/#email
+[14]: {{ site.baseurl }}/help/best_practices/email/overview/
 [15]: {{ site.baseurl }}/user_guide/engagement_tools/canvas/create_a_canvas/branching/#branching
diff --git a/_docs/_help/release_notes/2016/june.md b/_docs/_help/release_notes/2016/june.md
index 827f8269b0..f729ba6f53 100644
--- a/_docs/_help/release_notes/2016/june.md
+++ b/_docs/_help/release_notes/2016/june.md
@@ -9,7 +9,7 @@ page_order: 7
 
 “Exception events” are used to create powerful logic within action-based campaigns. They are used to remove end users from receiving a message; for example, “send users who abandon their shopping carts a push notification, unless they checkout.” By triggering off of an exception event, customers can direct additional messages and attention to the users who did checkout after abandoning their carts, creating a seamless and cohesive experience.
 
-## "Received Campaign with Tag" Segment Filter
+## "Received Message from Campaign with Tag" Segment Filter
 
 Customers can now exclude users who have received groups of campaigns by the same "Tag" functionality they have already been using.
 
diff --git a/_docs/_help/release_notes/2018/january.md b/_docs/_help/release_notes/2018/january.md
index 1053c52397..fc6bfdf811 100644
--- a/_docs/_help/release_notes/2018/january.md
+++ b/_docs/_help/release_notes/2018/january.md
@@ -15,6 +15,10 @@ You can now create segments using the following filters:
 - Opened/ Clicked Canvas Step
 - Last Received Specific Canvas Step
 
+{% alert update %}
+As of March 2019, `Received Canvas Step` has been renamed to `Received Message from Canvas Step`, and `Last Received Specific Canvas Step` has been renamed to `Last Received Message from Specific Canvas Step`.
+{% endalert %}
+
 ## Exporting Users Using Device ID
 
 This endpoint now accepts a device identifier as a parameter, which lets you to [export profiles of anonymous users][82].
diff --git a/_docs/_help/release_notes/2019/february.md b/_docs/_help/release_notes/2019/february.md
new file mode 100644
index 0000000000..9eb5553325
--- /dev/null
+++ b/_docs/_help/release_notes/2019/february.md
@@ -0,0 +1,19 @@
+---
+nav_title: February
+page_order: 11
+---
+# February 2019
+
+## Email Subscription Groups
+
+[Subscription Groups]({{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#subscription-groups) are segment filters that can further narrow your audience from the [Global Subscription States]({{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/) above. These Groups offer the ability to present more granular subscription options to end users.
+
+For example, if you send out multiple categories of email campaigns, you can offer your customers the option to subscribe or unsubscribe from those groups in bulk from a single page, using our [Email Preference Center](#email-preference-center).
+
+Use the [Subscription Group REST APIs]({{ site.baseurl }}/developer_guide/rest_api/subscription_group_api/) to programmatically manage the subscription groups that you have stored on the Braze dashboard to the Subscription Group page.
+
+## Email Preference Center
+
+The [Email Preference Center]({{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#email-preference-center) is an easy way to manage which users receive certain groups of newsletters. Each Subscription Group you create is added to the Preference Center list. Click on the name of the Preference Center to see an interactive preview.
+
+[support]: {{ site.baseurl }}/support_contact/
diff --git a/_docs/_help/release_notes/2019/march.md b/_docs/_help/release_notes/2019/march.md
new file mode 100644
index 0000000000..0c3bd5d114
--- /dev/null
+++ b/_docs/_help/release_notes/2019/march.md
@@ -0,0 +1,37 @@
+---
+nav_title: March
+page_order: 10
+---
+
+# March 2019
+
+## In-App Messages - Generation 3
+
+Braze is proud to announce that we have made improvements to the look and feel of our in-app messages to adhere to the latest UX and UI best practices. In the newest in-app messages, you can expect your users to interact with messages with
+- larger font sizes,
+- refined spacing,
+- a new close `x` asset,
+- improved responsive behavior for all message types to better fit viewports of all sizes, and
+- button borders to help you create custom contrasts between buttons.
+
+Our [new in-app messages]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/overview/) will take your interactions with your user from good to app-mazing!
+
+![Full-Screen Behavior]({% image_buster /assets/img/full-screen-behavior.gif %}){: style="border:0px;"}
+
+### What You Need to Do
+
+We highly recommend updating to the latest versions of the Braze SDKs for [Web]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/initial_sdk_setup/#upgrading-the-sdk), [iOS]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/initial_sdk_setup/), and [Android]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration/).
+
+After that, you're good to go!
+
+## Content Blocks Archive Update
+
+You can now archive and unarchive Content Blocks. Learn more in our main [Content Blocks documentation]({{ site.baseurl }}/user_guide/engagement_tools/templates_and_media/content_blocks/#archiving-content-blocks).
+
+## Inkit Partner Addition
+
+You can now use [Inkit]({{ site.baseurl }}/partners/inkit/) as a Predesigned Webhook Template or create a new Webhook Campaign.
+
+## Google Cloud Storage
+
+Google Cloud Storage is no longer in Beta! Braze is proud to announce that Google Cloud Storage is available to interested customers within the Braze platform. Go to __Technology Partners__ in your Braze account and search for Google Cloud Storage and [read more in our documentation]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents/).
diff --git a/_docs/_help/release_notes/deprecations.md b/_docs/_help/release_notes/deprecations.md
index 5754bdf5d3..0c3043bbe5 100644
--- a/_docs/_help/release_notes/deprecations.md
+++ b/_docs/_help/release_notes/deprecations.md
@@ -8,6 +8,28 @@ Technology is always moving - inside Braze and outside it! And we do our best to
 
 You might have gotten here from searching a term for an integration or feature that no longer exists. This is our attempt to keep you informed on our progress and movement within the technology industry.
 
+
+## Original In-App Messages
+
+_Replaced by: [In-App Messaging]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message)_
+
+_Braze Feature_
+
+_Support completely withdrawn: February 2019_
+
+Braze has improved the look and feel of In-App Messages to adhere to the latest UX and UI best practices and no longer supports original in-app messages.
+
+Braze moved over to a new form of in-app messages with the following SDK releases:
+
+- iOS: 2.19.0
+- Android: 1.13.0
+- Web: 1.3.0
+
+Prior to these releases, Braze supported "original in-app messages." Previously, support for original in-app messages was provided for any customer who ran an in-app campaign prior to the new release. All of the campaign stats were unaffected by the change, and those who had sent original in-app messages had the opportunity to send others via the "Create Campaign" button on the campaign screen.
+
+![Choices][15]
+
+
 ## Feedback
 
 _Braze Feature_
@@ -22,9 +44,9 @@ _Replaced by: [Firebase Cloud Messaging (FCM)]({{ site.baseurl }}/developer_guid
 
 _Integration_
 
-_Support to be completely withdrawn between July 2018 and April 2019._
+_Support to be completely withdrawn between July 2018 (Braze removal of support) and April 2019 (Google removal of support)._
 
-[Google will be removing support for GCM](https://developers.googleblog.com/2018/04/time-to-upgrade-from-gcm-to-fcm.html) as early as April 11, 2019. Braze may remove support for GCM from the Android SDKs at any point after July 31, 2018, which will be noted within [our Android SDK changelogs](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md). This means that existing GCM tokens will continue to work and you will be able to message your existing users. However, you will not be able to message new users.
+[Google will be removing support for GCM](https://developers.googleblog.com/2018/04/time-to-upgrade-from-gcm-to-fcm.html) as early as April 11, 2019. Braze will remove support for GCM from the Android SDKs in July 2018, which will be noted within [our Android SDK changelogs](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md). This means that existing GCM tokens will continue to work and you will be able to message your existing users. However, you will not be able to message new users.
 
 Customers that have not already migrated to [Firebase Cloud Messaging (FCM)]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/push_notifications/integration/#firebase-integration) may be affected by this change.
 
@@ -43,13 +65,13 @@ Braze has deprecated support for the Eclipse IDE as [Google is sunsetting suppor
 
 ## The Raw Event Stream (RES)
 
-_Replaced by: [Currents]({{ site.baseurl }}/technology_partners/currents/about/)_
+_Replaced by: [Currents]({{ site.baseurl }}/partners/braze_currents/about/)_
 
 _Braze Feature_
 
 _Support withdrawn: July 2018_
 
-The Raw Event Stream was the predecessor to [Currents]({{ site.baseurl }}/technology_partners/currents/about/) and was deprecated to make room for the future of Braze data.
+The Raw Event Stream was the predecessor to [Currents]({{ site.baseurl }}/partners/braze_currents/about/) and was deprecated to make room for the future of Braze data.
 
 ## Delay While Idle
 
@@ -63,3 +85,4 @@ The Delay While Idle parameter was previously a part of the [GCM push options](h
 
 
 [11]: {% image_buster /assets/img_archive/feedback_dashboard_example.png %} "Feedback Response Dashboard"
+[15]: {% image_buster /assets/img_archive/in-app-choices.png %}
diff --git a/_docs/_help/release_notes/most_recent.md b/_docs/_help/release_notes/most_recent.md
index 26ed0a6a5e..f5c13f0c55 100644
--- a/_docs/_help/release_notes/most_recent.md
+++ b/_docs/_help/release_notes/most_recent.md
@@ -7,59 +7,75 @@ page_order: 0
 
 _Braze releases information on it’s product updates on a monthly cadence. For more information on any of the updates listed in this section, reach out to your account manager or to [open a support ticket][support]._
 
-## January 2019
+## March 2019
 
-Welcome to a new year!
+### In-App Messages - Generation 3
 
-### Push Time to Live (TTL)
+Braze is proud to announce that we have made improvements to the look and feel of our in-app messages to adhere to the latest UX and UI best practices. In the newest in-app messages, you can expect your users to interact with messages with
+- larger font sizes,
+- refined spacing,
+- a new close `x` asset,
+- improved responsive behavior for all message types to better fit viewports of all sizes, and
+- button borders to help you create custom contrasts between buttons.
 
-In your account, within __Manage App Group__, click the [Push TTL Settings]({{ site.baseurl }}/user_guide/administrative/app_settings/push_ttl_settings/) tab to manage the time duration for attempted resends in the event that a device is offline.
+Our [new in-app messages]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/overview/) will take your interactions with your user from good to app-mazing!
 
-### Connected Content IP Whitelisting
+![Full-Screen Behavior]({% image_buster /assets/img/full-screen-behavior.gif %}){: style="border:0px;"}
 
-Braze is pleased to announce that due to a number of infrastructure upgrades made by our internal teams, we can now offer IP whitelisting for Connected Content on all clusters. In the future, we plan to add additional IPs for the non-EU clusters.
+#### What You Need to Do
 
-### Canvas Delay
+We highly recommend updating to the latest versions of the Braze SDKs for [Web]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/initial_sdk_setup/#upgrading-the-sdk), [iOS]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/initial_sdk_setup/), and [Android]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/initial_sdk_setup/android_sdk_integration/).
 
-We have added the option for any Canvas step to be sent __immediately__.
+After that, you're good to go!
 
-![Canvas Delay][canvas_delay]
+### Content Blocks Archive Update
 
-### Adjust (Technology Partner) REST Endpoint Field Update
+You can now archive and unarchive Content Blocks. Learn more in our main [Content Blocks documentation]({{ site.baseurl }}/user_guide/engagement_tools/templates_and_media/content_blocks/#archiving-content-blocks).
 
-With our updated integration with [Adjust]({{ site.baseurl }}/partners/adjust/), Braze customers will only need to add their rest endpoint from the Adjust partner spotlight page.
+### Inkit Partner Addition
 
-This will make it easier for customers wanting to pass attribution data into Braze.
+You can now use [Inkit]({{ site.baseurl }}/partners/inkit/) as a Predesigned Webhook Template or create a new Webhook Campaign.
+
+### Google Cloud Storage
+
+Google Cloud Storage is no longer in Beta! Braze is proud to announce that Google Cloud Storage is available to interested customers within the Braze platform. Go to __Technology Partners__ in your Braze account and search for Google Cloud Storage and [read more in our documentation]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents/).
+
+## February 2019
 
+### Email Subscription Groups
 
-## December 2018
+[Subscription Groups]({{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#subscription-groups) are segment filters that can further narrow your audience from the [Global Subscription States]({{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/) above. These Groups offer the ability to present more granular subscription options to end users.
 
-### Content Blocks
+For example, if you send out multiple categories of email campaigns, you can offer your customers the option to subscribe or unsubscribe from those groups in bulk from a single page, using our [Email Preference Center](#email-preference-center).
 
-[Content Blocks]({{ site.baseurl }}/user_guide/engagement_tools/templates_and_media/content_blocks/) allow you to manage your reusable, cross-channel content in a single, centralized location. To access this feature please go into the __Content Blocks Library__ tab in the __Templates & Media__ section of your Braze account. With Content Blocks, you can:
- - Create a consistent look and feel to your Email campaigns using Content Blocks as Headers and Footers.
- - Distribute the same offer codes through different channels.
- - Create pre-defined assets that can be used to build messages with consistent information and assets.
- - Copy entire message bodies to other messages.
+Use the [Subscription Group REST APIs]({{ site.baseurl }}/developer_guide/rest_api/subscription_group_api/) to programmatically manage the subscription groups that you have stored on the Braze dashboard to the Subscription Group page.
 
-### Gmail Promotional Tool
+### Email Preference Center
 
-Gmail has updated the mobile Promotions tab to allow marketers to send more information via annotations in a ‘card’, rather than just the subject line or pre-header information. Braze has built a tool to help you build the card from our product. [Learn how to use it here!]({{ site.baseurl }}/user_guide/message_building_by_channel/email/gmail_promotions_tab/)
+The [Email Preference Center]({{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#email-preference-center) is an easy way to manage which users receive certain groups of newsletters. Each Subscription Group you create is added to the Preference Center list. Click on the name of the Preference Center to see an interactive preview.
 
-## November 2018
+## January 2019
+
+Welcome to a new year!
+
+### Push Time to Live (TTL)
+
+In your account, within __Manage App Group__, click the [Push TTL Settings]({{ site.baseurl }}/user_guide/administrative/app_settings/push_ttl_settings/) tab to manage the time duration for attempted resends in the event that a device is offline.
 
-### Canvas Entry Settings Wizard
+### Connected Content IP Whitelisting
 
-The Canvas UI will be simplified to prevent missed tasks and resulting errors. Canvas configurations, specifically, will now be displayed in a wizard, similar to the design of the Campaigns wizard. See the [updated Canvas documentation here]({{ site.baseurl }}/user_guide/engagement_tools/canvas/create_a_canvas/create_a_canvas/)!
+Braze is pleased to announce that due to a number of infrastructure upgrades made by our internal teams, we can now offer IP whitelisting for Connected Content on all clusters. In the future, we plan to add additional IPs for the non-EU clusters.
 
-Want more on this new feature? [Check out our LAB course on the Entry Wizard here](https://lab.braze.com/the-new-canvas-entry-step/264889/scorm/20z5ij5ublxbk)!
+### Canvas Delay
 
+We have added the option for any Canvas step to be sent __immediately__.
 
-### In-App Message Web Modal CSS
+![Canvas Delay]({% image_buster /assets/img/canvas_delay_immediate.png %})
 
-The [Web Modal CSS editor]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/#web-modal-css) has been updated and allows you more control over the look of your In-App Messages with our new [CSS Templates]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/in_app_message_color_templates/#css-template).
+### Adjust (Technology Partner) REST Endpoint Field Update
 
+With our updated integration with [Adjust]({{ site.baseurl }}/partners/adjust/), Braze customers will only need to add their rest endpoint from the Adjust partner spotlight page.
 
+This will make it easier for customers wanting to pass attribution data into Braze.
 
 [support]: {{ site.baseurl }}/support_contact/
-[canvas_delay]: {% image_buster /assets/img/canvas_delay_immediate.png %}
diff --git a/_docs/_help/webinars/overview.md b/_docs/_help/webinars/overview.md
index 352bc58b73..e2b2bdc3a2 100644
--- a/_docs/_help/webinars/overview.md
+++ b/_docs/_help/webinars/overview.md
@@ -6,3 +6,15 @@ page_order: 0
 # Videos and Past Webinar Recordings
 
 These webinars are considered archived and not kept up to date, but can still provide educational content. For the most up-to-date educational content, check out [LAB](https://lab.braze.com) (Learning at Braze)!
+
+# Braze for Impact
+
+Braze for Impact is Braze's new podcast series!
+
+## Disclaimer
+
+This “Braze for Impact” Podcast (this “Podcast”) is the property of Braze, Inc. (“Braze”), and Braze reserves all rights, title and interest in and to this Podcast, including all related intellectual property rights therein. The information contained in this Podcast is intended only for personal, non-commercial, and educational purposes. No other use, including without limitation, distribution, modification, or reproduction of this Podcast, may be made without the prior written permission of Braze.
+
+Braze makes no warranty, guarantee, or representation as to the accuracy or reliability of the information featured in this Podcast. The information, opinions, and recommendations contained in this Podcast are for general information only and do not necessarily represent the views or opinions of Braze or its management. Any reliance on the information provided in this Podcast is at your own risk. This Podcast should not be considered professional advice. Braze does not endorse, approve, recommend, or certify any information, product, process, services or organizations presented or mentioned in this Podcast, and information from this Podcast should not be referenced in any way to imply such recommendation or endorsement. 
+
+BRAZE EXPRESSLY DISCLAIMS ANY AND ALL LIABILITY OR RESPONSIBILITY FOR ANY LOSS OR DAMAGE, INCLUDING WITHOUT LIMITATION, INDIRECT OR CONSEQUENTIAL DAMAGES, ARISING OUT OF ANY PARTY'S USE OF, REFERENCE TO, OR RELIANCE ON THIS PODCAST OR THE INFORMATION CONTAINED IN THIS PODCAST.
diff --git a/_docs/_hidden/other/support_contact.md b/_docs/_hidden/other/support_contact.md
index 44ba8a4431..001aa794a7 100644
--- a/_docs/_hidden/other/support_contact.md
+++ b/_docs/_hidden/other/support_contact.md
@@ -1215,9 +1215,9 @@ $( document ).ready(function() {
             <legend>Useful Resources</legend>
 
             <div id="ticket_usefulresources">
-              <a target="" href="{{ site.baseurl }}/user_guide/introduction/">Marketer documentation</a><br />
-              <a target="" href="{{ site.baseurl }}/developer_guide/platform_wide/platform_features/">Developer documentation</a><br />
-              <a target="" href="{{ site.baseurl }}/help/home/">Marketer troubleshooting guide</a><br />
+              <a target="" href="{{ site.baseurl }}/user_guide/introduction/">User Guide</a><br />
+              <a target="" href="{{ site.baseurl }}/developer_guide/platform_wide/platform_features/">Developer Guide</a><br />
+              <a target="" href="{{ site.baseurl }}/help/home/">Help & Troubleshooting Guides</a><br />
               <a target="" href="{{ site.baseurl }}/help/faqs/">FAQs</a><br />
               <a target="" href="https://lab.braze.com/">LAB</a><br />
               <a target="" href="https://dashboard.braze.com/">Braze Dashboard</a><br />
diff --git a/_docs/_hidden/private_betas/Advancement_Behavior.md b/_docs/_hidden/private_betas/Advancement_Behavior.md
new file mode 100644
index 0000000000..86453c9629
--- /dev/null
+++ b/_docs/_hidden/private_betas/Advancement_Behavior.md
@@ -0,0 +1,57 @@
+---
+nav_title: Advancement Behavior
+permalink: "/advancement_behavior/"
+---
+
+# Advancement Behavior
+
+## Canvas Default Behavior
+
+By default, we only advance users through a Canvas step once they've received a message from that step. For example, if a Canvas step includes an email and a push, users will not advance to the next steps of the Canvas until:
+
+- we send the user the email, or
+- we send the user the push.
+
+If the user doesn't receive the email or the push, they will not advance to subsequent steps in the Canvas.
+
+## Canvas Advancement Behavior
+
+The default behavior works well when subsequent messaging relates to the previous messages. For example, you wouldn't want to send a follow up push about an email that users never received.
+
+There may be times when you want users to continue to advance through a Canvas even when they do not receive a certain message. For example, you might have a "Welcome" push on __Day 3__ and a "Welcome" email on __Day 6__. Some of your users may not be reachable via push notifications (as not everyone opts into push). You want all users to receive the __Day 6__ email, even if they didn't get the __Day 3__ push.
+
+In this scenario, you can use Braze's Advancement Behavior options to ensure that customers continue down the Canvas, even if they do not receive the __Day 3__ push.
+
+## Using Advancement Behavior
+
+Braze's Advancement Behavior feature allows you to choose the criteria for advancement through your Canvas step.
+
+![auto2.png][1]
+
+
+When __Only Advance If Message Received__ is selected, customers will only be advanced to subsequent Canvas steps when one of the following conditions occur:
+
+- An email message is sent to the customer.
+- A push message is sent to the customer.
+- A webhook is sent to the customer.
+- An in-app message is viewed by the customer.
+
+When __Advance Entire Audience After Delay__ is selected, customers who meet the filter criteria for the step and do not perform exception events will be advanced through the Canvas regardless of whether they receive a message. Advancement will take place at the time that Braze attempts to send the message. In other words, users will be advanced when Braze attempts to send a message to the customer.
+
+Looping back to the use case at hand - if you want all users to receive the __Day 6__ email, even if they didn't get the __Day 3__ push you can select "Advance Entire Audience After Delay" advancement behavior for the __Day 3__ push.
+
+When you select __Advance Entire Audience After Delay__ advancement behavior for the __Day 3__ push, users will advance when Braze attempts to send the push. Users match the audience options and who are not reachable via push will not actually be sent the push, but will be advanced anyway.
+
+{% alert important %}
+  Users must meet the step's criteria in order to be advanced through the step. For a scheduled step, users must meet the audience options for the step in order to be advanced through the step. If the step has an exception event, users who perform the exception event will not be advanced through the step.
+{% endalert %}
+
+For action-based steps, users must perform the trigger action and meet the audience options in order to be advanced through the step. If the step has an exception event, users who perform the exception event will not be advanced through the step.
+
+{% alert important %}
+  Customers who advance through a step without receiving messages will not be counted as a unique recipient for the step. Users must receive one or more messages from a step to be counted as a unique recipient.
+{% endalert %}
+
+When sending a multichannel step with intelligent delivery, we may send or attempt to send messages at different times for different channels. Braze will Auto-Advance users at the time that the first message in a step attempts to send.   
+
+[1]: {% image_buster /assets/img/auto2.png %} "Advancement Behavior"
diff --git a/_docs/_hidden/private_betas/auto_advance.md b/_docs/_hidden/private_betas/auto_advance.md
new file mode 100644
index 0000000000..fc310deda9
--- /dev/null
+++ b/_docs/_hidden/private_betas/auto_advance.md
@@ -0,0 +1,41 @@
+---
+nav_title: Auto Advance
+permalink: /auto_advance/
+---
+
+# Auto Advance
+
+Auto-Advance is an option on Canvas Steps that allows users to continue down the Canvas, even if they do not receive a message from that particular step.
+
+![auto.png][1]
+
+When Auto-Advance **is not selected,** users must receive one or more messages from a step in order to be eligible for subsequent steps. Customers who do not receive at least one message for a given step will exit the Canvas and will not be evaluated for subsequent steps.
+
+When Auto-Advance **is selected** for a step, users who are eligible for the step but do not receive one or more messages from the step continue to make their way down the Canvas and are evaluated for subsequent steps.
+
+If Auto-Advance is selected, users will be Auto-Advanced when the following scenarios occur:
+
+**User Was Not Eligible For Channel**
+
+• Customer does not receive an iOS push message because they do have a push token for iOS push
+
+• Customer does not receive a push because they are not subscribed to push
+
+• Customer does not receive an email because they do not have a valid email address
+
+• Customer does not receive an email because they are not subscribed to email
+
+**Message Aborts For Customer**
+
+• Customer does not receive a message because the "Abort Message" liquid tag was called
+
+Users will not be Auto-Advanced if they are frequency capped from the Canvas Step. If a user does not receive a Canvas Step due to frequency capping, they will exit the Canvas.
+
+
+**Note** users must be eligible for a step in order to be Auto-Advanced through it. If a user does not meet the audience options for a step they will not be evaluated for that step, therefore they will not be eligible for Auto-Advance. If a user performs an exception event for a step, they are not eligible for the step and will exit the Canvas.
+
+**Note** customers who advance through a step without receiving messages will not be counted as a unique recipient for the step. Users must receive one or more messages from a step to be counted as a unique recipient.
+
+**Note** When sending a multichannel step with intelligent delivery, we may send or attempt to send messages at different times for different channels. Braze will Auto-Advance users at the time that the first message in a step attempts to send.   
+
+[1]: {% image_buster /assets/img_archive/auto.png %} "Auto-Advance"
diff --git a/_docs/_hidden/private_betas/canvas_in-app_messages.md b/_docs/_hidden/private_betas/canvas_in-app_messages.md
new file mode 100644
index 0000000000..6841656879
--- /dev/null
+++ b/_docs/_hidden/private_betas/canvas_in-app_messages.md
@@ -0,0 +1,106 @@
+---
+nav_title: In-App Messages in Canvas
+permalink: "/canvas_in-app_messages/"
+---
+
+# In-App Messages In Canvas
+
+{% include youtube.html id="6X8E20BlblI" align="right" %}
+
+Once you've set up delay and audience options, you can add an in-app message to your Canvas by selecting in-app message from "messaging channels."  Once a step's delay has passed and the audience options have been checked, the in-app message will be set live and users will see it if they open the app.
+
+You can customize [when your message will expire](#in-app-message-expiration) and which [advancement behavior](#advancement-behavior-options) it will have.
+
+<br>
+<br>
+
+{% alert note %}
+In-app messsages for Canvas is currently in beta. Please contact your Braze account manager if you are interested in participating in the beta.
+ {% endalert %}
+
+## In-App Message Expiration
+
+In the in-app message composer, you have the option to choose when the in-app message will expire.
+
+![Expire After][1]
+
+| Option | Description |
+|---|---|---|
+| Message Expires ... After | The first option allows you to expire the in-app message relative to when the step becomes available to the user. <br> <br> _For example, an in-app message with a two day expiration would become available after the step's delay elapses and audience options are checked. It would then be available for 2 days (48 hours) and during those two days users may see the in-app message if they open the app._ |
+| Message Expires By ... | The second option allows you choose a specific date and time when the in-app message will longer be available. <br> <br> _For example, if you have a sale that ended at a specific date and time, you might select this option so that once the sale ends users no longer see the associated in-app message._ |
+
+### Use Cases
+
+When should you use this feature? Braze highly recommends that you consider using this feature in your Promotional and Onboarding campaigns.
+
+{% tabs %}
+  {% tab Promotional %}
+__Promotional Canvases__
+
+Promotions, coupons, and sales often have hard expiration dates. The Canvas outlined below should alert your users at the most opportune times that there is a promotion they may use, and perhaps influence a purchase. This promotion expires by 2/28/2019 at 11:15 AM in the company's timezone.
+
+| Canvas Step | Delay | Audience | Channel | Expiration | Advancement | Details |
+|---|---|---|
+| Day 1: 50% Off | None | All from Entry | Push | N/A | Entire Audience after Delay | Initial push that alerts your users of the promotion. <br>  <br> This is intended to drive users to your app to take advantage of the promotion. |
+| In-App: 50% Off | None | All from Entry | In-App Message | Expires by: <br> 2/28/2019 <br> 11:15 AM <br> Company Time | In-App Message Viewed | The user has now opened the app and will receive this message whether or not that was because of the push message before. |
+| 50% Off Reminder | 1 Day <br> After the user receives the previous step. | All from Entry <br> _Filter: Last made a purchase more than one week ago._ | In-App Message |  Expires by: <br> 2/28/2019 <br> 11:15 AM <br> Company Time  | None <br> _Last message in Canvas._ | The user has received the in-app message in the previous step, but has not made a purchase despite being in the app.  <br>  <br> This message is meant to further draw the user to make a purchase using the promotion. |
+
+As you can see, the in-app messages expire when the promotion expires to prevent any discrepancies between the messaging and the customer experience.
+
+  {% endtab %}
+  {% tab Onboarding %}
+
+__User Onboarding Canvases__
+
+Your first impression with a user is, perhaps, your most critical one. It can make or break future visits to your app. Your initial communications with your user should be sensibly timed and encourage frequent visits to your app to promote usage.
+
+| Canvas Step | Delay | Audience | Channel | Expiration | Advancement | Details |
+|---|---|---|
+| Welcome Email | None | All from Entry | Email | N/A | Entire Audience after Delay | Initial email that welcomes your users to a project, membership, or other onboarding program. <br>  <br> This is intended to drive users to your app to begin their onboarding. |
+| Day 3-6 In-App Message | 3 Days <br> After the user receives the previous step. | All from Entry | In-App Message | Expires three days after the step becomes available. | In-App Message Live | If the user has acted upon the email and been driven to the app, they will receive the desired in-app message to continue or remind them of their onboarding and any requirements associated with it. |
+| Day 5 Push | 2 Days <br> After the user receives the previous step. | All from Entry | Push |  N/A  | Only Advance If Message Received | After users have received their in-app message, they will receive a follow-up push to continue their onboarding. |
+
+As you can see, the push messages are spaced around an in-app message to ensure that the user has visited the app and begun their onboarding. This will prevent any annoying spam or out-of-order messaging that could dissuade users from visiting your app, and instead create a flowing, sensible order to their initial experiences with your app.
+
+  {% endtab %}
+{% endtabs %}
+
+## Advancement Behavior Options
+
+Braze's Advancement Behavior feature allows you to choose the criteria for advancement through your Canvas step. [Steps with only in-app messages](#steps-with-in-app-messages-only) have different advancement options than [steps with multiple message types](#steps-with-multiple-message-channels) (push, email, etc.).
+
+### Steps with In-App Messages Only
+
+Steps with in-app messages have specific advancement options that allow you to specify the exact situation when
+
+![iamlive.png][2]
+
+
+| Option | Description |
+|---|---|---|
+| In-App Viewed | When "In-App Viewed" is selected, users will advance to the next steps of the Canvas when they view the in-app message in your application and log an in-app message impression.  <br> <br> _Users who do not view the in-app message before it expires will exit the Canvas and will not advance to subsequent steps._ |
+| In-App Live | When "In-App Live" is selected, users will advance to the next steps in the Canvas as soon as the in-app message becomes live. In-app messages are live once the delay for the step has elapsed and the audience options for the step have been checked.  <br> <br> _When this option is selected, all users who match the step's segment and filter criteria will be advanced to subsequent steps in the Canvas. Use this option when you want users to advance regardless of whether the in-app message is viewed or expires._ |
+
+{% alert important %}
+  When "In-App Live" is selected, the in-app message will be available until it expires, even if the user has moved to subsequent steps. If you do not want the in-app message to be live when next steps in the Canvas are delivered, ensure that the expiration is shorter than the delay on subsequent steps.
+{% endalert %}
+
+
+### Steps with Multiple Channels
+
+![iampush.png][3]
+
+Steps with an in-app message and another channel have the following advancement options:
+
+| Option | Description |
+|---|---|---|
+| Message Received | When message received is selected, users must be sent an email/webhook/push or view the in-app message in order to advance to subsequent steps in the Canvas.  <br> <br>  _If the in-app message expires and the user hasn't received the email/webhook/push or viewed the in-app message, they will exit the Canvas and will not advance to subsequent steps._ |
+| Advance Entire Audience After Delay | When this option is selected, everyone in the step's audience will advance to next steps after the delay elapses.  <br> <br> _Users must match the step's segment and filter criteria in order to advance to next steps._ |
+
+{% alert important %}
+  When "Entire Audience" is selected, the in-app message will be available until it expires, even if the user has moved to subsequent steps. If you do not want the in-app message to be live when next steps in the Canvas are delivered, ensure that the expiration is shorter than the delay on subsequent steps.
+{% endalert %}
+
+[1]: {% image_buster /assets/img/expires-after.png %} "IAM Live"
+[2]: {% image_buster /assets/img/iamlive.png %} "IAM Live"
+[3]: {% image_buster /assets/img/iampush.png %} "IAM Live"
diff --git a/_docs/_hidden/private_betas/content_cards.md b/_docs/_hidden/private_betas/content_cards.md
new file mode 100644
index 0000000000..880d18a6c1
--- /dev/null
+++ b/_docs/_hidden/private_betas/content_cards.md
@@ -0,0 +1,123 @@
+---
+nav_title: Content Cards Beta
+permalink: /content_cards/
+---
+
+# Content Cards Overview
+
+With Content Cards, you can send a highly targeted, dynamic stream of rich content to your customers right within the apps they love, without interrupting their experience. In addition, Content Cards support more personalized features, including card pinning, card dismissal, API-based delivery, custom card expiration times, card analytics, and easy coordination with push notifications. Braze's Content Cards beta is currently scheduled to begin in August of 2018. Note that any of the features described below could be subject to change throughout the course of the beta.
+
+
+Braze provides a default UI (pictured below) for Content Cards:
+
+![Default Feed][5]
+
+
+However, Content Cards are also highly customizable - here's an example of what a custom implementation of Content Cards could look like:
+
+![Content Card Feed][1]
+
+## Content Cards Improvements
+
+Content Cards is an improved version of Braze's News Feed product. Here's what we improved:
+
+- Content Cards is no longer a separate tab in the dashboard, making it easy to treat it as any other channel within your cross-channel campaigns.
+- Multi-variate testing is now available for Content Cards. Run the same tests across all channels.
+- Analytics are more detailed. We now display conversions and unique recipients and support engagement reports.
+- Take your campaign orchestration to the next level with improved scheduling capabilities. For example, send an API triggered card after a customer’s first purchase.
+- Preview your Content Cards before launch by sending yourself a test from the message composer.
+
+## Content Cards Use Cases and Best Practices
+
+1. Use Content Cards to help make your app feel dynamic and regularly updated by showcasing new content.
+2. Coordinate a Content Card with each push message such that customers have a persistent record of promotions and customers without pushes enabled have access to promotions.
+3. Trigger a content card when a customer performs a custom event.
+4. Trigger content cards via API and use api trigger properties for personalization - for example, add an order confirmation to a user’s Content Cards.
+5. Take advantage of the visual space by incorporating images and graphics that stand out.
+6. Customize Content Cards to reflect your brand’s identity and create a seamless app experience.
+7. Develop a schedule for campaigns like onboarding etc., and determine the proper cadence and frequency of messaging.
+
+
+## Sending Content Cards
+
+Content Cards can be sent in multivariate and multichannel campaigns. Content Cards can be scheduled, API triggered or triggered by an event. When a Content Card is sent to a user, it will be added to that user's queue of available Content Cards. When users navigate to their Content Cards feed, they can browse through their available Content Cards.
+
+
+Content Card sending is similar to email and push sending:
+
+- Segmentation is evaluated at the time that the Content Card is sent
+- Personalization is templated at the time that the content card is sent
+- Once sent, Content Cards cannot be edited (however, you can remove them from users' feeds when archiving or stopping a campaign on the Dashboard)
+
+
+
+### Expiration Dates
+
+Once a Content Card is sent, it can be available for a user for up to 30 days. Content Cards have configurable expiration dates - you can either choose that the card expires a certain number of days after it's sent or that it expires on a particular date and time. Note that we'll store up to 100 cards in each user's Content Cards feed.  
+
+
+### Pinning a Content Card
+
+By default, Content Cards will be displayed in chronological order, with the most recently sent cards at the top of the Content Cards feed.
+
+At times, you might have important content that should be shown first, even if it's not the most recent card that a user has recieved. Important messages can be pinned - pinned cards will display at the top of a user's feed and cannot be dismissed by the user. Note that if more than one card in a user's feed is pinned, the pinned cards will display in chronological order. Note that Content Cards cannot be retroactively pinned or unpinned - you must select the pin option you'd like to use before they are sent to users.
+
+Also note that with a custom integration, it's possible to customize the order in which cards display.
+
+![Content_Cards_Expiry][3]
+
+### Previewing and Testing
+
+Before sending out a Content Card to your users, you may want to test it to make sure it looks right and operates in the intended manner. Creating and sending test messages to select devices or members of your team is very simple using the tools in the dashboard. Simply send yourself or your team a test message the same way you would for any other channel. Note that test Content Cards expire after 5 minutes.
+
+![test sending][4]
+
+### Other Items to Note
+
+The following capabilities are not supported for phase one of the Content Cards Beta:
+
+- Connected Content
+- Vouchers
+- Frequency Capping
+- Re-ordering Content Cards from the Dashboard
+- Post-launch Edits  
+
+## Content Cards Analytics
+
+Analytics for Content Cards include sends, impressions, clicks, and dismissals. Additionally, like other campaigns, you can also view unique recipients, revenue, and conversions. You can view these stats on the campaign analytics Dashboard page, by using Engagement Reports, or through our analytics APIs.
+
+|Metric|Definition|Details|
+|---|---|---|
+|Messages Sent|The number of Content Cards added to users' feeds.|Like email, a Content Card that is sent is not seen by a user until they open their Content Cards feed.|
+|Total Impressions|The number of times Content Cards from a campaign have been viewed.|A user viewing a Content Card(s) from a campaign multiple times represents multiple total impressions.|
+|Unique Impressions|The number of users who have viewed Content Cards from a campaign.|A user viewing a Content Card(s) from a campaign multiple times represents one unique impression.|
+|Total Clicks|The number of times Content Cards from a campaign have been clicked.|A user clicking a Content Card(s) from a campaign multiple times represents multiple total clicks.|
+|Unique Clicks|The number of users who have clicked Content Cards from a campaign.|A user clicking a Content Card(s) from a campaign multiple times represents one unique click.|
+|Total Dismissals|The number of times Content Cards from a campaign have been dismissed.|A user dismissing a Content Card(s) from a campaign multiple times represents multiple total dismissals.|
+|Unique Dismissals|The number of users who have dismissed Content Cards from a campaign.|A user dismissing a Content Card(s) from a campaign multiple times represents one unique dismissal.|
+|Unique Recipients|The number of users who have viewed Content Cards from a campaign. This is based on daily sends.|A user viewing a Content Card(s) from a campaign multiple times represents one unique recipient. However, due to campaign re-eligibility, a user receiving and viewing multiple Content Cards from a campaign on different days represents multiple unique recipients (this is the difference between unique recipients and unique impressions).|
+|Conversions|The number of users who, after viewing Content Cards from a campaign, perform the campaign's conversion event within the conversion window. This is based on daily sends.|The conversion window for a user begins when they view a given Content Card for the first time.|
+
+## Migrating From News Feed to Content Cards
+
+### Features and Functionality
+
+Content Cards offers many capabilities that are not supported by Braze's current News Feed such as additional delivery options like action-based, API delivery, and enhanced analytics like conversion tracking.
+
+As you plan your migration from the News Feed to Content Cards, it will be important to note the main differences between Content Cards and the News Feed:
+
+- Content Cards segmentation is evaluated at the time messages are sent, News Feed segmentation is evaluated at the time that News Feed Cards are viewed
+- Content Cards personalization is templated at the time messages are sent, News Feed card personalization is templated at the time that News Feed Cards are viewed
+
+### Implementation
+
+- Content Cards and the News Feed are separate products so a simple integration in your apps or website is necessary in order to use Content Cards
+- If desired, existing News Feed Cards will need to be manually migrated to Content Card Campaigns when you switch from News Feed to Content Cards
+- Content Cards is not intended to be used at the same time as the News Feed as it's a replacement for the News Feed
+- Content Cards does not currently support categories, use cases for categories can be achieved via customization and key value pairs
+
+
+[1]:{% image_buster /assets/img_archive/content_cards.png %}
+[3]:{% image_buster /assets/img_archive/content_cards_expiry.png %}
+[4]:{% image_buster /assets/img_archive/test_send.png %}
+[5]:{% image_buster /assets/img_archive/contentcard.png %}
diff --git a/_docs/_hidden/private_betas/content_cards_for_android.md b/_docs/_hidden/private_betas/content_cards_for_android.md
new file mode 100644
index 0000000000..1663c7885e
--- /dev/null
+++ b/_docs/_hidden/private_betas/content_cards_for_android.md
@@ -0,0 +1,546 @@
+---
+nav_title: Content Cards for Android
+permalink: /content_cards_android/
+
+---
+
+# Content Cards for Android
+
+Content Cards are Braze’s new messaging channel which will allow you to create individual messages that appear in a user’s message inbox. This feature is set to, in the future, replace the legacy feature _News Feed channel_, as it provides superior behavior and functionality.
+
+With Content Cards, you can send a highly targeted, dynamic stream of rich content to your customers right within the apps they love, without interrupting their experience. In addition, Content Cards support more personalized features, including card pinning, card dismissal, API-based delivery, custom card expiration times, card [analytics]({{ site.baseurl }}/content_cards/#content-cards-analytics), and easy coordination with push notifications.
+
+## Example Content Card {#example-content-card-for-android}
+
+![Content Card Example][1]
+
+## Content Cards Integration Overview {#content-cards-integration-for-android}
+
+In Android, Content Cards and the feedback form are implemented as [Fragments][2] that are available in the Braze Android UI project. View [Google's documentation on Fragments][3] for information on how to add a Fragment to an Activity.
+
+The `AppboyContentCardsFragment` class will automatically refresh and display the contents of the Content Cards and log usage analytics. The cards that can appear in a user's ContentCards are set on the Braze dashboard.
+
+## Content Cards Customization {#content-cards-customization-for-android}
+
+### Default Styling {#default-styling-for-android}
+
+The Braze UI elements (IAMs and Content Cards) come with a default look and feel that matches the Android standard UI guidelines and provides a seamless experience. You can see these default styles in the `res/values/style.xml` file in the Braze SDK distribution.
+
+```xml
+  <style name="Appboy"/>
+
+  <!-- Content Cards Example -->
+  <style name="Appboy.ContentCards.CaptionedImage.Description">
+    <item name="android:textColor">@color/com_appboy_description</item>
+    <item name="android:textSize">15.0sp</item>
+    <item name="android:includeFontPadding">false</item>
+    <item name="android:paddingBottom">8.0dp</item>
+    <item name="android:layout_marginLeft">10.0dp</item>
+    <item name="android:layout_marginRight">10.0dp</item>
+    <item name="android:layout_marginTop">8.0dp</item>
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_below">@id/com_appboy_content_cards_captioned_image_card_title_container</item>
+  </style>
+```
+
+### Overriding Styles {#overriding-styles-for-android}
+
+If you would prefer, you can override these styles to create a look and feel that better suits your app. To override a style, copy it in its entirety to the `styles.xml` file in your own project and make modifications. The whole style must be copied over to your local `styles.xml` file in order for all of the attributes to be correctly set.
+
+#### Correct Style Override {#correct-style-override-for-android}
+
+```xml
+<style name="Appboy.ContentCardsDisplay">
+  <item name="android:background">@color/mint</item>
+  <item name="android:cacheColorHint">@color/mint</item>
+  <item name="android:divider">@android:color/transparent</item>
+  <item name="android:dividerHeight">16.0dp</item>
+  <item name="android:paddingLeft">12.5dp</item>
+  <item name="android:paddingRight">5.0dp</item>
+  <item name="android:scrollbarStyle">outsideInset</item>
+</style>
+```
+
+#### Incorrect Style Override {#incorrect-style-override-for-android}
+
+```xml
+<style name="Appboy.ContentCardsDisplay">
+  <item name="android:background">@color/mint</item>
+  <item name="android:cacheColorHint">@color/mint</item>
+</style>
+```
+
+## Content Cards Style Elements {#content-cards-style-elements-for-android}
+
+### Setting A Custom Font {#setting-a-custom-font-for-android}
+
+Braze allows for setting a custom font using the [font family guide][40]. To use it, override a style for cards and use the `fontFamily` attribute to instruct Braze to use your custom font family.
+
+For example, to update the font on all titles for Captioned Image Cards, override the `Appboy.ContentCards.CaptionedImage.Title` style and reference your custom font family. The attribute value should point to a font family in your `res/font` directory.
+
+Here is a truncated example with a custom font family, `my_custom_font_family`, referenced on the last line:
+
+```xml
+  <style name="Appboy.ContentCards.CaptionedImage.Title">
+    <item name="android:layout_width">wrap_content</item>
+    ...
+    <item name="android:fontFamily">@font/my_custom_font_family</item>
+    <item name="fontFamily">@font/my_custom_font_family</item>
+  </style>
+```
+
+### Customizing Displayed Card Order {#customizing-displayed-card-order-for-android}
+
+Here's information on how to change how any card is rendered in the recyclerView. The `IContentCardsViewBindingHandler` interface defines how all Content Cards get rendered. You can customize this to change anything you want.
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+public class DefaultContentCardsViewBindingHandler implements IContentCardsViewBindingHandler {
+  /**
+   * A cache for the views used in binding the items in the {@link android.support.v7.widget.RecyclerView}.
+   */
+  private final Map<CardType, BaseContentCardView> mContentCardViewCache = new HashMap<CardType, BaseContentCardView>();
+
+  @Override
+  public ContentCardViewHolder onCreateViewHolder(Context context, List<Card> cards, ViewGroup viewGroup, int viewType) {
+    CardType cardType = CardType.fromValue(viewType);
+    return getContentCardsViewFromCache(context, cardType).createViewHolder(viewGroup);
+  }
+
+  @Override
+  public void onBindViewHolder(Context context, List<Card> cards, ContentCardViewHolder viewHolder, int adapterPosition) {
+    Card cardAtPosition = cards.get(adapterPosition);
+    BaseContentCardView contentCardView = getContentCardsViewFromCache(context, cardAtPosition.getCardType());
+    contentCardView.bindViewHolder(viewHolder, cardAtPosition);
+  }
+
+  @Override
+  public int getItemViewType(Context context, List<Card> cards, int adapterPosition) {
+    Card card = cards.get(adapterPosition);
+    return card.getCardType().getValue();
+  }
+
+  /**
+   * Gets a cached instance of a {@link BaseContentCardView} for view creation/binding for a given {@link CardType}.
+   * If the {@link CardType} is not found in the cache, then a view binding implementation for that {@link CardType}
+   * is created and added to the cache.
+   */
+  @VisibleForTesting
+  BaseContentCardView getContentCardsViewFromCache(Context context, CardType cardType) {
+    if (!mContentCardViewCache.containsKey(cardType)) {
+      // Create the view here
+      BaseContentCardView contentCardView;
+      switch (cardType) {
+        case BANNER:
+          contentCardView = new BannerImageContentCardView(context);
+          break;
+        case CAPTIONED_IMAGE:
+          contentCardView = new CaptionedImageContentCardView(context);
+          break;
+        case SHORT_NEWS:
+          contentCardView = new ShortNewsContentCardView(context);
+          break;
+        case TEXT_ANNOUNCEMENT:
+          contentCardView = new TextAnnouncementContentCardView(context);
+          break;
+        default:
+          contentCardView = new DefaultContentCardView(context);
+          break;
+      }
+      mContentCardViewCache.put(cardType, contentCardView);
+    }
+    return mContentCardViewCache.get(cardType);
+  }
+}
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+class DefaultContentCardsViewBindingHandler : IContentCardsViewBindingHandler {
+  /**
+   * A cache for the views used in binding the items in the [android.support.v7.widget.RecyclerView].
+   */
+  private val mContentCardViewCache = HashMap<CardType, BaseContentCardView<*>>()
+
+  override fun onCreateViewHolder(context: Context, cards: List<Card>, viewGroup: ViewGroup, viewType: Int): ContentCardViewHolder? {
+    val cardType = CardType.fromValue(viewType)
+    return getContentCardsViewFromCache(context, cardType)?.createViewHolder(viewGroup)
+  }
+
+  override fun onBindViewHolder(context: Context, cards: List<Card>, viewHolder: ContentCardViewHolder, adapterPosition: Int) {
+    val cardAtPosition = cards[adapterPosition]
+    val contentCardView = getContentCardsViewFromCache(context, cardAtPosition.cardType)
+    contentCardView?.bindViewHolder(viewHolder, cardAtPosition)
+  }
+
+  override fun getItemViewType(context: Context, cards: List<Card>, adapterPosition: Int): Int {
+    val card = cards[adapterPosition]
+    return card.cardType.value
+  }
+
+  /**
+   * Gets a cached instance of a [BaseContentCardView] for view creation/binding for a given [CardType].
+   * If the [CardType] is not found in the cache, then a view binding implementation for that [CardType]
+   * is created and added to the cache.
+   */
+  @VisibleForTesting
+  @NonNull
+  internal fun getContentCardsViewFromCache(context: Context, cardType: CardType): BaseContentCardView<*>? {
+    if (!mContentCardViewCache.containsKey(cardType)) {
+      // Create the view here
+      val contentCardView: BaseContentCardView<*>
+      when (cardType) {
+        CardType.BANNER -> contentCardView = BannerImageContentCardView(context)
+        CardType.CAPTIONED_IMAGE -> contentCardView = CaptionedImageContentCardView(context)
+        CardType.SHORT_NEWS -> contentCardView = ShortNewsContentCardView(context)
+        CardType.TEXT_ANNOUNCEMENT -> contentCardView = TextAnnouncementContentCardView(context)
+        else -> contentCardView = DefaultContentCardView(context)
+      }
+      mContentCardViewCache[cardType] = contentCardView
+    }
+    return mContentCardViewCache[cardType]
+  }
+}
+```
+
+{% endtab %}
+{% endtabs %}
+
+And here's how to use the above class:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+IContentCardsViewBindingHandler viewBindingHandler = DefaultContentCardsViewBindingHandler();
+
+AppboyContentCardsFragment fragment = getMyCustomFragment();
+fragment.setContentCardsViewBindingHandler(viewBindingHandler);
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+val viewBindingHandler = DefaultContentCardsViewBindingHandler()
+
+val fragment = getMyCustomFragment()
+fragment.setContentCardsViewBindingHandler(viewBindingHandler)
+```
+
+{% endtab %}
+{% endtabs %}
+
+There are additional relevant resources on this topic available here (https://medium.com/google-developers/android-data-binding-recyclerview-db7c40d9f0e4).
+
+### Setting a Custom Content Cards Click Listener
+
+You can handle Content Cards clicks manually by setting a custom Content Cards click listener. This enables use cases such as selectively using the native web browser to open web links.
+
+#### Step 1: Implement a Content Cards Click Listener
+
+Create a class that implements IContentCardsActionListener and register it with `AppboyContentCardsManager`. Implement the `onContentCardClicked()`` method, which will be called when the user clicks a content card.
+
+#### Step 2: Instruct Braze to Use Your Content Card Click Listener
+
+You can see an example of steps 1 and 2 here:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+AppboyContentCardsManager.getInstance().setContentCardsActionListener(new IContentCardsActionListener() {
+  @Override
+  public boolean onContentCardClicked(Context context, Card card, IAction cardAction) {
+    return false;
+  }
+
+  @Override
+  public void onContentCardDismissed(Context context, Card card) {
+
+  }
+});
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+AppboyContentCardsManager.getInstance().contentCardsActionListener = object : IContentCardsActionListener {
+  override fun onContentCardClicked(context: Context, card: Card, cardAction: IAction): Boolean {
+    return false
+  }
+
+  override fun onContentCardDismissed(context: Context, card: Card) {
+
+  }
+}
+```
+
+{% endtab %}
+{% endtabs %}
+
+### Fully Custom Content Card Display {#fully-custom-content-card-display-for-android}
+
+If you would like to display the Content Cards in a completely custom manner, it is possible to do so by using your own views populated with data from our models. To obtain Braze’s content cards models, you will need to subscribe for content card updates and use the resulting model data to populate your views. You will also need to log analytics on the model objects as users interact with your views.
+
+#### Part 1: Subscribing to Content Card Updates
+
+First, declare a private variable in your custom class to hold your subscriber:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+// subscriber variable
+private IEventSubscriber<ContentCardsUpdatedEvent> mContentCardsUpdatedSubscriber;
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+private val mContentCardsUpdatedSubscriber: IEventSubscriber<ContentCardsUpdatedEvent>? = null
+```
+
+{% endtab %}
+{% endtabs %}
+
+Next, add the following code to subscribe to Content Card updates from Braze, typically inside of your custom Content Cards activity's `Activity.onCreate()`:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+// Remove the previous subscriber before rebuilding a new one with our new activity.
+Appboy.getInstance(this).removeSingleSubscription(mContentCardsUpdatedSubscriber, ContentCardsUpdatedEvent.class);
+mContentCardsUpdatedSubscriber = new IEventSubscriber<ContentCardsUpdatedEvent>() {
+    @Override
+    public void trigger(ContentCardsUpdatedEvent event) {
+        // List of all content cards
+        List<Card> allCards = event.getAllCards();
+
+        // Your logic below
+    }
+};
+Appboy.getInstance(this).subscribeToContentCardsUpdates(mContentCardsUpdatedSubscriber);
+Appboy.getInstance(this).requestContentCardsRefresh(true);
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+// Remove the previous subscriber before rebuilding a new one with our new activity.
+Appboy.getInstance(this).removeSingleSubscription(mContentCardsUpdatedSubscriber, ContentCardsUpdatedEvent::class.java)
+mContentCardsUpdatedSubscriber = IEventSubscriber { event ->
+  // List of all content cards
+  val allCards = event.allCards
+
+  // Your logic below
+}
+Appboy.getInstance(this).subscribeToContentCardsUpdates(mContentCardsUpdatedSubscriber)
+Appboy.getInstance(this).requestContentCardsRefresh(true)
+```
+
+{% endtab %}
+{% endtabs %}
+
+We also recommend unsubscribing when your custom activity moves out of view. Add the following code to your activity's `onDestroy()` lifecycle method:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+Appboy.getInstance(this).removeSingleSubscription(mContentCardsUpdatedSubscriber, ContentCardsUpdatedEvent.class);
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+Appboy.getInstance(this).removeSingleSubscription(mContentCardsUpdatedSubscriber, ContentCardsUpdatedEvent::class.java)
+```
+
+{% endtab %}
+{% endtabs %}
+
+#### Part 2: Logging Analytics
+
+When using custom views, you will need to log analytics manually as well, since analytics are only handled automatically when using Braze views.
+
+To log a display of the Content Cards, call Appboy.logContentCardsDisplayed()
+
+To log an impression or click on a Card, call [`Card.logClick()`][7] and [`Card.logImpression()`][8] respectively.
+
+## Read/Unread Indicators {#read-indicators-for-android}
+
+Braze allows you to optionally toggle on an Unread/Read indicator on Content Cards.
+
+Unread content cards pic here
+
+### Customizing the Indicators {#customizing-the-indicators-for-android}
+These indicators can be customized by altering the values in the style `Appboy.ContentCards.UnreadBar`.
+
+## Card Types {#card-types-for-android}
+Braze has 5 unique Content Cards card types which share a base model. Each card type also has additional card-specific properties which are listed below.
+
+#### Base Card {#base-card-for-android}
+
+The [Base Card][29] model provides foundational behavior for all cards.  
+
+|Property | Description |
+|---|---|
+|`getId()` | Returns the card’s ID set by Braze.|
+|`getViewed()` | Returns a boolean reflects if the card is read or unread by the user.|
+|`getExtras()` | Returns a map of key-value extras for this card.|
+|`getCreated()`  | Returns the unix timestamp of the card’s creation time from Braze.|
+|`getIsPinned` | Returns a boolean that reflects whether the card is pinned.|
+|`getOpenUriInWebView()`  | Returns a boolean that reflects whether Uris for this card should be opened in Braze's WebView or not.|
+|`getExpiredAt()` | Gets the expiration date of the card.|
+|`getIsRemoved()` | Returns a boolean that reflects whether the end user has dismissed this card.|
+|`getIsDismissible()`  | Returns a boolean that reflects whether the card is pinned.|
+
+#### Banner Image Card {#banner-image-card-for-android}
+[Banner Image Cards][30] are clickable full-sized images. In addition to the base card properties:
+
+|Property | Description |
+|---|---|
+|`getImageUrl()` | Returns the URL of the card’s image.|
+|`getUrl()` | Returns the URL that will be opened after the card is clicked. It can be a http(s) URL or a protocol URL.|
+|`getDomain()` | Returns link text for the property URL.|
+
+#### Captioned Image Card {#captioned-image-card-for-android}
+[Captioned Image Cards][31] are clickable full-sized images with accompanying descriptive text. In addition to the base card properties:
+
+|Property | Description |
+|---|---|
+|`getImageUrl()` | Returns the URL of the card’s image.|
+|`getTitle()` | Returns the title text for the card.
+|`getDescription()` | Returns the body text for the card.
+|`getUrl()` | Returns the URL that will be opened after the card is clicked. It can be a http(s) URL or a protocol URL.
+|`getDomain()` | Returns the link text for the property URL.
+
+#### Text Announcement Card (Captioned Image without Image) {#text-Announcement-card-for-android}
+[Text Announcement Cards][32] are clickable cards containing descriptive text. In addition to the base card properties:
+
+|Property | Description |
+|---|---|
+|`getTitle()` | Returns the title text for the card.
+|`getDescription()` | Returns the body text for the card.
+|`getUrl()` | Returns the URL that will be opened after the card is clicked. It can be a http(s) URL or a protocol URL.
+|`getDomain()` | Returns the link text for the property URL.
+
+#### Short News Card
+[Short News Cards][33] are clickable cards with images and accompanying descriptive text.  In addition to the base card properties:
+
+|Property | Description |
+|---|---|
+|`getImageUrl()` | Returns the URL of the card’s image.
+|`getTitle()` | Returns the title text for the card.
+|`getDescription()` | Returns the body text for the card.
+|`getUrl()` | Returns the URL that will be opened after the card is clicked. It can be a http(s) URL or a protocol URL.
+|`getDomain()` | Returns the link text for the property URL.
+
+#### Cross Promotion Small Card
+[Cross-Promotion Small Cards][34] link to items in the Google Play Store or Kindle Store. In addition to the base card properties:
+
+|Property | Description |
+|---|---|
+|`getTitle()` | Returns the title text for the card. This will be the promoted item’s name.
+|`getSubtitle()` | Returns the text of the category of the promoted item.
+|`getImageUrl()` | Returns property is the URL of the card’s image.
+|`getPackage()` | Returns the package name of the promoted item.
+|`getRating()` | Returns the rating of the promoted app. This property will be 0.0 unless the promoted item is an app, in which case the rating will be in the range of [0.0, 5.0];
+|`getPrice()` | Returns the price of the promoted app.
+|`getReviewCount()` | Returns the number of reviews of the promoted app. This property will be 0 unless the promoted item is an app.
+|`getCaption()` | Returns the text that will be displayed in the tag on the top of the small cross promotion card.
+|`getUrl()` | Returns the URL of the promoted item which leads to the item’s App Store page.
+
+## Adding a Badge
+
+You can request the number of unread cards at any time by calling:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+Appboy.getInstance(context).getContentCardUnviewedCount()
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+Appboy.getInstance(context).contentCardUnviewedCount
+```
+
+{% endtab %}
+{% endtabs %}
+
+## Refreshing Content Cards
+
+You can queue a manual refresh of the Braze Content Cards at any time by calling:
+
+{% tabs %}
+{% tab JAVA %}
+
+```java
+Appboy.getInstance(context).requestContentCardsRefresh()
+```
+
+{% endtab %}
+{% tab KOTLIN %}
+
+```kotlin
+Appboy.getInstance(context).requestContentCardsRefresh()
+```
+
+{% endtab %}
+{% endtabs %}
+
+## Key-Value Pairs
+`Card` objects may optionally carry key-value pairs as `extras`. These can be used to send data down along with a `Card` for further handling by the application.
+
+See the [Javadoc][36] for more information.
+
+## GIFs {#gifs-news-content-cards}
+
+{% include archive/android/gifs.md channel="Content Cards" %}
+
+[1]:{% image_buster /assets/img_archive/contentcard.png %}
+[2]: http://developer.android.com/guide/components/fragments.html
+[3]: http://developer.android.com/guide/components/fragments.html#Adding "Android Documentation: Fragments"
+[4]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/analytics/tracking_sessions/
+[5]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/DroidBoyActivity.java
+[6]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#logFeedDisplayed--
+[7]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/Card.html#logClick--
+[8]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/Card.html#logImpression--
+[9]: {{ site.baseurl }}/developer_guide/platform_integration_guides/web/news_feed/#card-types
+[14]: {{ site.baseurl }}/help/best_practices/news_feed/
+[16]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/Appboy.html#requestFeedRefresh()
+[18]: {% image_buster /assets/img_archive/Image27Theming.png %} "Android Feed"
+[19]: {% image_buster /assets/img_archive/Image28Theming.png %} "Android Cards"
+[20]: {% image_buster /assets/img_archive/Image29Theming.png %} "Android Empty"
+[21]: {% image_buster /assets/img_archive/Image30Theming.png %} "Android Network Error"
+[22]: {% image_buster /assets/img_archive/sample_news_feed.png %}
+[23]: {% image_buster /assets/img_archive/android_news_feed.png %}
+[25]: {% image_buster /assets/img_archive/UnreadvsReadNewsFeedCard.png %}
+[26]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/drawable-hdpi/icon_unread.png
+[27]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/res/drawable-hdpi/icon_read.png
+[28]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/AndroidManifest.xml "AndroidManifest.xml"
+[29]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/Card.html
+[30]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/BannerImageCard.html
+[31]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/CaptionedImageCard.html
+[32]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/TextAnnouncementCard.html
+[33]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/ShortNewsCard.html
+[34]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/CrossPromotionSmallCard.html
+[36]: https://appboy.github.io/appboy-android-sdk/javadocs/com/appboy/models/cards/Card.html#getExtras--
+[37]: https://github.com/Appboy/appboy-android-sdk/blob/master/android-sdk-ui/src/com/appboy/ui/feed/listeners/IFeedClickActionListener.java
+[38]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/CustomFeedClickActionListener.java
+[39]: https://github.com/Appboy/appboy-android-sdk/blob/master/droidboy/src/main/java/com/appboy/sample/PreferencesActivity.java#L183
+[40]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/font_customization/#font-customization
diff --git a/_docs/_hidden/private_betas/content_cards_for_ios.md b/_docs/_hidden/private_betas/content_cards_for_ios.md
new file mode 100644
index 0000000000..1bf19c7fdc
--- /dev/null
+++ b/_docs/_hidden/private_betas/content_cards_for_ios.md
@@ -0,0 +1,223 @@
+---
+nav_title: Content Cards for iOS
+permalink: /content_cards_ios/
+
+---
+# Content Cards for iOS
+
+Content Cards are Braze’s new messaging channel which will allow you to create individual messages that appear in a user’s message inbox. This feature is set to, in the future, replace the legacy feature _News Feed channel_, as it provides superior behavior and functionality.
+
+With Content Cards, you can send a highly targeted, dynamic stream of rich content to your customers right within the apps they love, without interrupting their experience. In addition, Content Cards support more personalized features, including card pinning, card dismissal, API-based delivery, custom card expiration times, card [analytics]({{ site.baseurl }}/content_cards/#content-cards-analytics), and easy coordination with push notifications.
+
+## Example Content Card
+
+
+![Content Card Example][1]
+
+
+## Content Cards View Controller Integration
+
+Content Cards can be integrated with two view controller contexts: Navigation or Modal.
+
+### Navigation Context
+
+Set the instance's title and navigation items before pushing it into a navigation controller:
+
+```objc
+ABKContentCardsTableViewController *contentCards = [ABKContentCardsTableViewController getNavigationFeedViewController];
+[self.navigationController pushViewController:contentCards animated:YES];
+```
+
+### Modal Context
+
+This modal is used to present the view controller in a modal view, with a navigation bar on top and a Done button on the right side of the bar.
+
+Set the modal's title via the `navigationBarTitle` property:
+
+```objc
+ABKContentCardsViewController *contentCards = [[ABKContentCardsViewController alloc] init];
+[self.navigationController presentViewController:contentCards animated:YES completion:nil];
+```
+For examples of these view controllers, check out the [Stopwatch Sample Project](https://github.com/Appboy/appboy-ios-sdk/tree/master/Example/Stopwatch).
+
+## Requesting Unread Content Card Counts: Badges
+
+If you would like to display the number of unread content cards your user has, we suggest you request a card count and represent it with a Badge. Badges are a great way to call attention to new content awaiting your users in the Content Cards. If you'd like to add a badge to your Content Cards, the Braze SDK provides methods to query the following:
+
+- Unviewed Content Cards for the current user
+- Total Viewable Content Cards for the current user
+
+The method declarations in [ABKContentCardsController](https://appboy.github.io/appboy-ios-sdk/docs/interface_a_b_k_content_cards_controller.html) below describe this in detail:
+
+```
+/*!
+ * This method returns the number of currently active content cards which have not been viewed.
+ * A "view" happens when a card becomes visible in the Content Cards view.  This differentiates
+ * between cards which are off-screen in the scrolling view, and those which
+ * are on-screen; when a card scrolls onto the screen, it's counted as viewed.
+ *
+ * Cards are counted as viewed only once -- if a card scrolls off the screen and
+ * back on, it's not re-counted.
+ *
+ * Cards are counted only once even if they appear in multiple Content Cards views or across multiple devices.
+ */
+- (NSInteger)unviewedContentCardCount;
+/*!
+ * This method returns the total number of currently active content cards. Cards are
+ * counted only once even if they appear in multiple Content Cards views.
+ */
+- (NSInteger)contentCardCount;
+```
+
+
+### Displaying Number of Unviewed Content Cards on App Badge Count
+
+In addition to serving as push notification reminders for an app, Badges can also be utilized to denote unviewed items in the user's Content Cards feed. Updating the badge count based off unviewed Content Cards updates can be a valuable tool in attracting users back to your app and increasing sessions.
+
+This method records the badge count once the app is closed and the user's session ends:
+
+```objc
+(void)applicationDidEnterBackground:(UIApplication *)application
+```
+
+Within the above method, implement the following code which actively updates the badge count while the user views cards during a given session:
+
+```objc
+[UIApplication sharedApplication].applicationIconBadgeNumber = [[Appboy sharedInstance].contentCardsController unviewedContentCardCount];
+```
+
+For more information see the [`Appboy.h` header file](https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/Appboy.h).
+
+
+## Refreshing Content Cards
+
+You can manually request Braze to refresh the user's Content Cards in `Appboy.h` using `- (void)requestContentCardsRefresh;`. For example:
+
+```objc
+[[Appboy sharedInstance] requestContentCardsRefresh];
+```
+
+For more information see the [`Appboy.h` header file](https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyKit/headers/AppboyKitLibrary/Appboy.h).
+
+
+## Customizing the Content Cards Feed
+
+You can create your own Content Cards interface by extending `ABKContentCardsTableViewController`. You can customize all UI elements and Content Cards behavior in this way. Or you can create a completely custom view controller and subscribe for data updates. In this case you would need to log all view and dismissed events and clicks manually.
+
+
+### Disabling the Unviewed Indicator
+
+You can choose to disable the blue line at the bottom of the cards which indicates whether or not the card has been viewed by setting the `disableUnviewedIndicator` property in `ABKContentCardsTableViewController` to YES.
+
+## Content Cards Data Model
+The Content Cards data model is available in the iOS SDK.
+
+### Getting the Data
+
+To access the Content Cards data model, subscribe to Content Cards update events:
+
+{% tabs %}
+{% tab OBJECTIVE-C %}
+```objc
+// Subscribe to content cards updates
+// Note: you should remove the observer where appropriate
+[[NSNotificationCenter defaultCenter] addObserver:self
+                                         selector:@selector(contentCardsUpdated:)
+                                             name:ABKContentCardsProcessedNotification
+                                           object:nil];
+```
+
+```objc
+// Called when content cards are refreshed (via `requestContentCardsRefresh`)
+- (void)contentCardsUpdated:(NSNotification *)notification {
+  BOOL updateIsSuccessful = [notification.userInfo[ABKContentCardsProcessedIsSuccessfulKey] boolValue];
+  // check for success
+  // get the cards using [[Appboy sharedInstance].contentCardsController getContentCards];
+}
+```
+{% endtab %}
+{% tab swift %}
+```swift
+// Subscribe to content card updates
+// Note: you should remove the observer where appropriate
+NotificationCenter.default.addObserver(self, selector:
+  #selector(contentCardsUpdated),
+  name:NSNotification.Name.ABKContentCardsProcessed, object: nil)
+```
+
+```swift
+// Called when the content cards are refreshed (via `requestContentCardsRefresh`)
+private func contentCardsUpdated(_ notification: Notification) {
+  if let updateSuccessful = notification.userInfo?[ABKContentCardsProcessedIsSuccessfulKey] as? Bool {
+    // check for success
+    // get the cards using Appboy.sharedInstance()?.contentCardsController.getContentCards();
+  }
+}
+```
+{% endtab %}
+{% endtabs %}
+
+If you want to change the card data after it's been sent by Braze, we recommend storing (deep copy) the card data locally, updating the data and displaying yourself. The cards are accessible via [ABKContentCardsController].
+
+### Base Card Model
+
+Braze has three unique card types that share a base model. Each type of card also has additional properties that are specific to each card which are listed below.
+
+#### Base Content Card Model Properties
+
+|Model|Description|
+|---|---|
+|`idString` | (read only) The card's ID set by Braze. |
+| `viewed` | This property reflects if the card is viewed or not viewed by the user|
+| `created` | (read only) This property is the unix timestamp of the card's creation time from Braze. |
+| `expiresAt` | (read only) This property is the unix timestamp of the card's expiration time.|
+| `dismissible` | This property reflects if the card can be dismissed by the user.|
+| `pinned` | This property reflects if the card has been pinned by the user.|
+| `dismissed` | This property reflects if the card has been dismissed by the user.|
+| `url` | The URL that will be opened after the card is clicked on. It can be a http(s) URL or a protocol URL.|
+| `openURLInWebView` | This property determines whether the URL will be opened within the app or in an external web browser.|
+| `extras`| An optional NSDictionary of NSString values.|
+
+#### Banner Content Card Properties
+
+|Model|Description|
+|---|---|
+| `image` | This property is the URL of the card's image.|
+| `imageAspectRatio` | This property is the aspect ratio of the card's image.|
+
+#### Captioned Image Content Card Properties
+
+|Model|Description|
+|---|---|
+| `image` | This property is the URL of the card's image.|
+| `imageAspectRatio` | This property is the aspect ratio of the card's image.|
+| `title` | The title text for the card.|
+| `cardDescription` | The body text for the card.|
+| `domain` | The link text for the property URL, like @"blog.braze.com". It can be displayed on the card's UI to indicate the action/direction of clicking on the card.|
+
+#### Classic Content Card Properties
+
+|Model|Description|
+|---|---|
+| `image` | (optional) This property is the URL of the card's image.|
+| `title` | The title text for the card. |
+| `cardDescription` | The body text for the card. |
+| `domain` | The link text for the property url, like @"blog.braze.com". It can be displayed on the card's UI to indicate the action/direction of clicking on the card. |
+
+## Card Methods
+
+|Method|Description|
+|---|---|
+| `logContentCardImpression` | Manually log an impression to Braze for a particular card. |
+| `logContentCardClicked` | Manually log a click to Braze for a particular card. The SDK will only log a card click when the card has the `url` property with a valid value. |
+| `logContentCardDismissed` | Manually log a dismissal to Braze for a particular card.|
+
+## Log Content Cards Display
+
+When displaying the Content Cards in your own user interface, you can manually record Content Cards impressions via `- (void)logContentCardsDisplayed;`. For example:
+
+```objc
+[[Appboy sharedInstance] logContentCardsDisplayed];
+```
+
+[1]:{% image_buster /assets/img_archive/contentcard.png %}
diff --git a/_docs/_hidden/private_betas/content_cards_web.md b/_docs/_hidden/private_betas/content_cards_web.md
new file mode 100644
index 0000000000..9ca76cd9a1
--- /dev/null
+++ b/_docs/_hidden/private_betas/content_cards_web.md
@@ -0,0 +1,98 @@
+---
+nav_title: Content Cards for Web
+permalink: /content_cards_web/
+
+---
+# Content Cards for Web
+
+Content Cards are Braze’s new messaging channel which will allow you to create individual messages that appear in a user’s message inbox. This feature is set to, in the future, replace the legacy feature _News Feed channel_, as it provides superior behavior and functionality.
+
+With Content Cards, you can send a highly targeted, dynamic stream of rich content to your customers right within the apps they love, without interrupting their experience. In addition, Content Cards support more personalized features, including card pinning, card dismissal, API-based delivery, custom card expiration times, card [analytics]({{ site.baseurl }}/content_cards/#content-cards-analytics), and easy coordination with push notifications.
+
+
+## Example Content Card
+
+
+![Content Card Example][1]
+
+
+## Content Cards for Web Integration
+
+To toggle display of Content Cards through the Braze Web SDK, call
+`appboy.display.toggleContentCards();`
+
+
+This will show the Content Cards if they are not shown, and hide them if they are. If no parameters are defined (null), all Content Cards will be shown in a fixed-position sidebar on the right-hand side of the page.
+
+|Parameters | Description |
+|---|---|
+|`parentNode` | The HTML node to render the content cards into. If the parent node already has a Braze content cards view as a direct descendant, the existing content cards will be replaced. |
+|`filterFunction` | A filter/sort function for cards displayed in this view. Invoked with the array of ab.Card objects, sorted by {pinned, date}. Expected to return an array of sorted ab.Card objects to render for this user. If omitted, all cards will be displayed. |
+
+[See the JS docs](https://js.appboycdn.com/web-sdk/latest/doc/module-display.html#.toggleContentCards) for more information on toggling Content Cards.
+
+### Other Methods to Note
+
+|Method | Description | Link|
+|---|---|---|
+|`showContentCards`| Display the user's Content Cards. | [JS Docs for showContentCards](https://js.appboycdn.com/web-sdk/latest/doc/module-display.html#.showContentCards)|
+|`hideContentCards`| Hide any Braze content cards currently showing. | [JS Docs for hideContentCards](https://js.appboycdn.com/web-sdk/latest/doc/module-display.html#.hideContentCards)
+|`showContentCards`| Display the user's content cards. | [JS Docs for showContentCards](https://js.appboycdn.com/web-sdk/latest/doc/module-display.html#.showContentCards)
+|`getCachedContentCards()`|Get all currently available cards from the last content cards refresh.| [JS Docs for getCachedContentCards](https://js.appboycdn.com/web-sdk/latest/doc/module-appboy.html#.getCachedContentCards)|
+|`subscribeToContentCardsUpdates(subscriber)`| Subscribe to content cards updates. The subscriber callback will be called whenever content cards are updated. |  [JS Docs for subscribeToContentCardsUpdates](https://js.appboycdn.com/web-sdk/latest/doc/module-appboy.html#.getCachedContentCards)|
+
+
+## Content Cards Customization
+
+Braze UI elements come with a default look and feel that matches the composers within the Braze Dashboard and aims for consistency with other Braze mobile platforms. Braze's default styles are defined in CSS within the Braze SDK. By overriding selected styles in your application, it is possible to customize our standard feed with your own background images, font families, styles, sizes, animations, and more. For instance, the following is an example override that will cause Content Cards to appear 800px wide:
+
+``` css
+body .ab-feed {
+  width: 800px;
+}
+```
+
+
+## Read/Unread Indicators
+
+Braze provides indicators on Content Cards as pictured below:
+
+
+|Indicator|Example |
+|---|---|
+|Read | ![ReadContentCard][2] |
+| Unread | ![UnreadContentCard][3] |
+
+
+### Disabling the Indicators
+
+In order to disable this functionality add the following style to your css:
+
+``` css
+.ab-unread-indicator { display: none; }
+```
+
+## Content Card Types for Web
+The Braze Web SDK supports several unique Content Card card types, [ab.ClassicCard](), [ab.Banner](), [ab.CaptionedImage]() which share a base model, [ab.Card][().
+
+### Requesting Unviewed Content Card Count for Web
+
+You can request the number of unread cards at any time by calling:
+
+``` javascript
+appboy.getCachedContentCards().getUnviewedCardCount();
+```
+
+This is often used to power badges signifying how many unread content cards there are. See the [JSDocs](https://js.appboycdn.com/web-sdk/latest/doc/ab.ContentCards.html#toc4) for more information.
+
+> Braze will not refresh Content Cards on new page loads (and so this function will return 0) until you show the feed or call `appboy.requestContentCardsRefresh();`.
+
+### Key-Value Pairs
+`ab.Card` objects may optionally carry key-value pairs as `extras`. These can be used to send data down along with a card for further handling by the application. Call `card.extras` to access these values.
+
+
+
+
+[1]:{% image_buster /assets/img_archive/contentcard.png %}
+[2]:{% image_buster /assets/img_archive/readcontentcard.png %}
+[3]:{% image_buster /assets/img_archive/unreadcontentcard.png %}
diff --git a/_docs/_hidden/private_betas/frequency_capping.md b/_docs/_hidden/private_betas/frequency_capping.md
new file mode 100644
index 0000000000..a0c5fe8002
--- /dev/null
+++ b/_docs/_hidden/private_betas/frequency_capping.md
@@ -0,0 +1,60 @@
+---
+nav_title: Frequency Capping By Tag
+permalink: "/frequency_capping_tag/"
+---
+
+# Frequency Capping by Tag
+
+## Frequency Capping Rules
+
+Frequency Capping can be set up for each app group by selecting Global Campaign Settings found underneath the Campaigns tab. From here, you can choose:
+
+- Which message channel you would like to cap (push, email, webhook or any of those three).
+
+- How many times each user should receive Campaign/Canvas step sends from channel within a certain time frame, which can be measured in minutes, days, weeks (7 days) and months.
+
+Each line of frequency caps will be connected using an “AND,” and you’re able to add as many as you wish. In addition, you may include multiple caps for the same message types. For instance, you can cap users to no more than one (1) push per day and no more than 3 pushes per week.
+
+Frequency Capping is applied at the Campaign/Canvas step send level. For example, if you've selected the below as your capping rules:
+
+![rule][3]{: height="70%" width="70%"}
+
+**And the following scenario occurs:**
+
+- A user triggers the same Campaign, Campaign ABC three times during the course of a week
+- This user triggers Campaign ABC once on Monday, once on Wednesday and once on Thursday
+
+The expected behavior is that:
+
+- This user will receive the Campaign sends that triggered on Monday and Wednesday
+- This user will not receive the third Campaign send on Thursday because the user has already received two push Campaign sends that week
+
+{% alert important %}
+You can add up to ten (10) frequency capping rules per app group.
+{% endalert %}
+
+## Frequency Capping By Tag
+
+Frequency capping rules can be applied to specific tags.
+
+For example, if you wanted to allow users to receive no more than three (3) push notification Campaigns/ Canvas steps per week from all Campaign/Canvas steps and no more than 2 push notification Campaign/Canvas steps per week with the tag "promotional". When the below rules are applied, users will receive no more than three (3) Campaign sends per week over all Campaigns/Canvas steps and no more than two (2) push notification Campaigns/Canvas steps with the tag "promotional."
+
+![rule][2]{: height="70%" width="70%"}
+
+{% alert important %}
+When rules conflict, the most restrictive, applicable frequency capping rule will be applied to your users.
+{% endalert %}
+
+ So, if you've added the following rules:
+
+![global][1]{: height="70%" width="70%"}
+
+ The customer will not receive more than one (1) push notification Campaign/Canvas steps with the tag "promotional" in a given week, because you've specified that customers should not receive more than one (1) push notification Campaign/Canvas step from all Campaign/Canvas steps.  In other words, the most restrictive applicable frequency rule is the rule that will be applied to a given user.
+
+{% alert important %}
+Canvases are tagged at the Canvas level, so each Canvas Step will inherit all of the Canvas level tags.
+{% endalert %}
+
+[1]: {% image_buster /assets/img/global_rules.png %} "global rules"
+[2]: {% image_buster /assets/img/tag_rule_fnfn.png %} "rules"
+[3]: {% image_buster /assets/img/standard_rules_fnfn.png %} "rules standard"
diff --git a/_docs/_hidden/private_betas/most_engaged_channel.md b/_docs/_hidden/private_betas/most_engaged_channel.md
new file mode 100644
index 0000000000..d73cd4a173
--- /dev/null
+++ b/_docs/_hidden/private_betas/most_engaged_channel.md
@@ -0,0 +1,39 @@
+---
+nav_title: Most Engaged Channel
+permalink: /most_engaged_channel/
+---
+
+# Most Engaged Channel Filter
+The Most Engaged Channel filter allows you to select users for whom the selected messaging channel is their "best" channel ("best" meaning "has the highest likelihood of engagement, given the user's history"). You can select Email, Web Push, or Mobile Push (which includes any available mobile OS or device) as a channel.
+
+![most_engaged_channel_filter][1]{: height="50%" width="50%"}
+
+The Most Engaged Channel computes the engagement rate for each user for each of the three channels by taking the ratio of # of opens or interactions to the number of messages received over the last 3 months of activity. The available channels are ranked according to their respective engagement ratios, and the channel with the highest ratio is the "Most Engaged" for that user.
+
+{% alert note %}
+If you have requested access to the Channel Optimization (Most Engaged Channel) beta feature, Braze agrees to grant you access to this Beta feature, and by your use of this Beta feature, you agree that such use shall be subject in full to the language in the MSA between you and Braze relating to Beta features.
+{% endalert %}
+
+## The "Not Enough Data" Option
+
+For Braze to determine which channel is "best", there needs to be adequate data. This means that you should have sent at least three (3) or more messages on at least two (2) of the three (3) available channels (these messages need not necessarily be opened). 
+
+So, if a user only has data for one (1) channel, or less than three (3) messages received on two (2) or three (3) channels, that user will then fall under the "Not Enough Data" option of this filter. This will allow you to choose to use whichever messaging channel you wish for the users that do not have a "Most Engaged Channel" reliably calculated.
+
+For example, if you want users who prefer _push messages_ to receive a push, as well as users for whom there is not enough data to receive the same push message, you could set the "Most Engaged Channel" filter as "Mobile" and use __OR__ to add a second "Most Engaged Channel" filter set to "Not Enough Data".
+
+## The "Mobile Push" Option
+
+Mobile Push incorporates Android, iOS, Windows, Kindle, and all other mobile device channels available on Braze. When computing the Most Engaged Channel, Braze looks at each kind of mobile device separately, but then chooses the highest engagement rate among them to represent the "Mobile Push" category when comparing against Email and Web Push. So a user with an iPhone, Android phone, and iPad with engagement rates of 0.1, 0.2, and 0.45, respectively would have their Mobile Push engagement rate calculated as the best of all those devices: 0.45. This would not, however, force that user to receive Push notifications on the iPad— they can still be considered as preferring “Mobile Push” even when using the filter on an Android push message.
+
+## Best Practices & Effective Use Strategy
+
+### Tie-Breaking
+
+Because some users will have low numbers of messages received, it is not unusual to have "ties" in engagement rates across the available channels for a single given user (a single user has a 0.2 engagement rate for __both__ Email and Mobile Push). In such cases, ties will be broken by prioritizing (giving a higher ranking to) the channel with the most recent open events.
+
+### Unreachable Channels
+
+When the user has sufficient data for a ranking to be determined, but becomes unreachable on their "Most Engaged Channel", the user will "fall out" and not receive any messages. Braze plans to modify this behavior so that the user will be considered "Most Engaged" on the next most engaged (and reachable) channel.
+
+[1]: {% image_buster /assets/img/most_engaged_channel.png %} "Most Engaged Channel Filter"
diff --git a/_docs/_home/styling_test_page.md b/_docs/_home/styling_test_page.md
index b8c77b032f..915bc85302 100644
--- a/_docs/_home/styling_test_page.md
+++ b/_docs/_home/styling_test_page.md
@@ -316,6 +316,25 @@ Link here: [Braze.com](https://www.braze.com)
 # Embedded video test
 {% include youtube.html id="XY5uXoKIvFY" %}
 
+
+# Embedded video right align test
+{% include youtube.html id="XY5uXoKIvFY" align="right" %}
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis congue tortor sed tincidunt cursus. Sed iaculis molestie ligula, vel aliquam ante ultrices vel. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum nec risus velit. Curabitur urna tellus, dictum non convallis ac, porta vel neque. Ut egestas magna et turpis ullamcorper ultricies. Cras dolor lacus, fringilla sed enim ut, porttitor convallis arcu. Nam placerat neque vitae vestibulum dictum. Nam in pulvinar neque. Quisque eget sodales est. Mauris mattis porta felis scelerisque convallis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nunc sodales nibh vitae felis ultrices consectetur. Etiam efficitur elementum ante.
+
+Vivamus ac commodo massa. Donec maximus, arcu nec aliquet malesuada, augue nibh venenatis elit, nec egestas libero turpis nec est. Aliquam condimentum molestie massa in finibus. Nulla sit amet pretium lectus, ut pulvinar mi. Fusce eget sapien ac diam mollis aliquam. Sed tellus est, tristique sed turpis vel, aliquet mattis nunc. Vestibulum maximus, dolor et luctus malesuada, leo sapien facilisis turpis, tincidunt suscipit turpis massa condimentum tortor. Nulla molestie at ex placerat vulputate. Integer sed tortor vel mauris rutrum consectetur a nec sapien.
+
+Proin sed commodo mi, non bibendum metus. Praesent non justo lacus. Curabitur non feugiat nisl. Nam commodo tortor quis urna auctor consectetur. Duis at nisl eu tellus consectetur laoreet. Integer id orci congue, elementum ex non, lacinia neque. Aenean dictum tempus nibh ac fringilla. Vestibulum condimentum vel lectus ac lobortis. Nulla vehicula semper nisi, sed sodales metus ornare nec. Cras leo urna, finibus vitae nisi sit amet, mattis aliquam mi.
+
+
+# Embedded video left align test
+{% include youtube.html id="XY5uXoKIvFY" align="left" %}
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed pretium elit non pulvinar tristique. Sed tellus dolor, commodo id laoreet non, pretium id velit. Donec tristique egestas felis, quis sagittis nibh sodales quis. Ut ut urna faucibus, sagittis justo dictum, efficitur arcu. Phasellus consequat nunc mollis, convallis eros at, euismod ex. Morbi id finibus velit, eu sollicitudin sem. Cras feugiat quis nibh non convallis.
+
+Donec urna odio, gravida eu arcu sit amet, placerat aliquam erat. In sit amet nulla fermentum, tempor nulla nec, eleifend urna. Proin condimentum ipsum arcu, et venenatis elit luctus nec. Vestibulum risus lacus, cursus eget lacus eu, aliquam malesuada justo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nunc porttitor rutrum molestie. Aenean in ligula at odio dignissim sodales. Nunc consequat enim id odio varius aliquam. Maecenas tempus ipsum id ligula bibendum congue. Praesent sed urna vitae velit dapibus scelerisque vel a magna. Phasellus molestie lobortis sem eu malesuada.
+
+
 ## Usage:
 {% raw  %}
 ```html
@@ -323,6 +342,17 @@ Link here: [Braze.com](https://www.braze.com)
 ```
 {% endraw  %}
 
+To align right or left, and limit max width to 50% use the `align` parameter = `left` or `right`:
+{% raw  %}
+```html
+{% include youtube.html id="[youtubeid]" align="left" %}
+
+{% include youtube.html id="[youtubeid]" align="right" %}
+
+```
+{% endraw  %}
+
+
 # List Test
 
 ## Bullet
diff --git a/_docs/_partners/braze_currents/about.md b/_docs/_partners/braze_currents/about.md
index 7550385119..489d8ec601 100644
--- a/_docs/_partners/braze_currents/about.md
+++ b/_docs/_partners/braze_currents/about.md
@@ -14,7 +14,7 @@ To access this data for analysis, we recommend our Currents tool, a simple way t
 Currents allows you to…
 * Send Braze event data into a data warehouse or to one of [our analytics partners]({{ site.baseurl }}/partners/braze_currents/integration/available_partners/) for detailed analysis.
 * Export Braze event data in a continuous stream to power business intelligence tools, machine learning algorithms, and more.
-* Route Braze event data to a variety of other systems using [Segment]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/segment_for_currents/) or [mPartcle]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/mparticle_for_currents/).
+* Route Braze event data to a variety of other systems using [Segment]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/segment_for_currents/) or [mParticle]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/mparticle_for_currents/).
 * There’s so much more you can do with event data, accessed by Currents. Trust us - [we use Currents, too]({{ site.baseurl }}/partners/braze_currents/advanced_topics/how_braze_uses_currents/)!
 
 ## Access Currents
diff --git a/_docs/_partners/braze_currents/advanced_topics/how_braze_uses_currents.md b/_docs/_partners/braze_currents/advanced_topics/how_braze_uses_currents.md
index faf80d1c74..a4ac93fcc1 100644
--- a/_docs/_partners/braze_currents/advanced_topics/how_braze_uses_currents.md
+++ b/_docs/_partners/braze_currents/advanced_topics/how_braze_uses_currents.md
@@ -27,7 +27,7 @@ Snowflake isn't your only warehouse option. You can also choose [Redshift](https
 
 ## Step 4: Use a BI Tool to Manipulate Your Data
 
-Finally, we use a BI tool to analyze our data, turn it into charts and other visual tools, and more using Looker and Looker Blocks so we don't have to ETL/ELT data every time it moves from Currents.
+Finally, we use a BI tool to analyze our data, turn it into charts and other visual tools, and more using [Looker and Looker Blocks](https://looker.com/platform/blocks/directory#braze) so we don't have to ETL/ELT data every time it moves from Currents.
 
 Check out the docs below to get more information on these and how you can use them to build your database!
 
diff --git a/_docs/_partners/braze_currents/advanced_topics/s3_to_snowflake.md b/_docs/_partners/braze_currents/advanced_topics/s3_to_snowflake.md
new file mode 100644
index 0000000000..a7bc474f0d
--- /dev/null
+++ b/_docs/_partners/braze_currents/advanced_topics/s3_to_snowflake.md
@@ -0,0 +1,208 @@
+---
+nav_title: Transfer Data from Amazon S3 to Snowflake
+page_order: 2
+---
+
+# Transfer Data from Amazon S3 to Snowflake
+If your data is currently sitting in Amazon S3, you can transfer it to Snowflake or another relational data warehouse using the ELT process (Extract Load Transform).
+
+{% alert note %}
+If you have more specific use cases and would like Braze to service your Currents instance, reach out to your Braze Account Manager and ask them about Braze Data Professional Services.
+{% endalert %}
+
+## Automated Load Process
+This automated load process moves data into [Snowflake](https://www.snowflake.com/), which will allow you to use the [Braze Looker Blocks](https://looker.com/platform/blocks/directory#braze) to visualize that data in Looker to help drive insights and feedback into your Campaigns, Canvases, and Segments.
+
+Once you have a Currents to S3 export set up and are receiving live events data, it is time to configure your live ELT pipeline in Snowflake by configuring the following components:
+- [AWS SQS Queues](#aws-sqs-queues)
+- [Auto-Ingest Snowpipes](#auto-ingest-snowpipes)
+
+### AWS(c) SQS Queues
+
+__Auto-ingest Snowpipes__ rely on SQS queues for sending notification from S3 to Snowpipe. This process is managed by Snowflake after configuring SQS.
+
+#### Configure the External S3 Stage
+
+{% alert note %}
+Tables in your database are created from this stage.
+{% endalert %}
+
+In AWS, create a new __public-private key pair__ with grants according to your organization’s security requirements.
+
+Then, in Snowflake, create a Snowflake S3 Stage (called `braze_data`) as followis:
+
+```js
+create or replace stage currents.public.braze_data
+    url='s3://snowpipe-demo/'
+    credentials = (AWS_KEY_ID = '...' AWS_SECRET_KEY = '...' );
+show stages;
+```
+
+Next, define the AVRO file format for our stage.
+
+```js
+create file format currents.public.currents_avro type = 'avro' compression = 'auto';
+```
+
+```js
+alter stage currents.public.braze_data set file_format = currents.public.currents_avro;
+```
+
+Finally, use the `show stages;` command to show your SQS information. The name of the SQS queue will be visible in a new column called `NOTIFICATION_CHANNEL`.
+
+#### Create Bucket Events
+In AWS, navigate to the corresponding bucket of the new Snowflake stage. Then, under the __Properties__ tab, go to __Events__.
+
+![AWS Properties][1]{: height="50%" width="50%"}
+
+In __Events__, create new events for each set of Currents Data, as needed ([Messaging]({{ site.baseurl }}/partners/braze_currents/data_storage_events/message_engagement_events/) and/or [User Behavior]({{ site.baseurl }}/partners/braze_currents/data_storage_events/customer_behavior_events/)).
+
+![AWS Events][2]{: height="50%" width="50%"}
+
+Check the appropriate box for the object create notifications, as well as the ARN on the bottom of the form (from the notification channel column in Snowflake).
+
+### Snowpipe Setup
+
+In order for the above configuration to produce the correct tables, you must define the structure of the incoming data properly using the examples below and the structures determined in our [Message Engagement or Messaging Events]({{ site.baseurl }}/partners/braze_currents/data_storage_events/message_engagement_events/) and/or [User or Customer Behavior Events]({{ site.baseurl }}/partners/braze_currents/data_storage_events/customer_behavior_events/) Currents documentation.
+
+It is critical that your tables are structured in accordance to the Braze Currents schemas, as Braze Currents will continuously load data into them via specific fields with specific data types (a `user_id` will always be loaded as a string and called a `user_id` in Currents data).
+
+{% alert note %}
+  Depending on your Currents integration, you may have different events you must set up ([Message Engagement or Messaging Events]({{ site.baseurl }}/partners/braze_currents/data_storage_events/message_engagement_events/), [User or Customer Behavior Events]({{ site.baseurl }}/partners/braze_currents/data_storage_events/customer_behavior_events/), or both).  You can also write a script for some or all of this process.
+{% endalert %}
+
+
+{% tabs %}
+  {% tab User Behavior Events %}
+
+First, create a table INTO which we will continuously load using the following structure:
+
+```js
+CREATE TABLE USERS_BEHAVIORS_APP_FIRSTSESSION
+    (
+        id               STRING,
+        user_id          STRING,
+        external_user_id STRING,
+        app_id           STRING,
+        time             INT,
+        session_id       STRING,
+        gender           STRING,
+        country          STRING,
+        timezone         STRING,
+        language         STRING,
+        device_id        STRING,
+        sdk_version      STRING,
+        platform         STRING,
+        os_version       STRING,
+        device_model     STRING
+    );
+```
+
+Then, create the AUTO continuous load pipe and specify
+1. which table to load and
+2. how to load the following table.
+
+```js
+CREATE OR REPLACE PIPE PIPE_USERS_BEHAVIORS_APP_FIRSTSESSION
+                            auto_ingest=true AS
+COPY INTO USERS_BEHAVIORS_APP_FIRSTSESSION
+          FROM 
+            (select $1:id::STRING,
+            $1:user_id::STRING,
+            $1:external_user_id::STRING,
+            $1:app_id::STRING,
+            $1:time::INT,
+            $1:session_id::STRING,
+            $1:gender::STRING,
+            $1:country::STRING,
+            $1:timezone::STRING,
+            $1:language::STRING,
+            $1:device_id::STRING,
+            $1:sdk_version::STRING,
+            $1:platform::STRING,
+            $1:os_version::STRING,
+            $1:device_model::STRING from @currents.public.braze_data/currents/dataexport.prod-01.S3.integration.INTEGRATION_ID_GOES_HERE/event_type=users.behaviors.app.FirstSession/);
+```
+
+{% alert warning %}
+You must repeat the CREATE TABLE and CREATE PIPE commands for every event type.
+{% endalert %}
+
+ {% endtab %}
+ {% tab Messaging Events %}
+
+First, create a table INTO which we will continuously load using the following structure:
+
+```js
+CREATE TABLE "CURRENTS_PM"."PUBLIC".PUBLIC_USERS_MESSAGES_PUSHNOTIFICATION_OPEN (
+        id STRING,
+        user_id STRING,
+        external_user_id STRING,
+        time INT,
+        timezone STRING,
+        app_id STRING,
+        campaign_id STRING,
+        campaign_name STRING,
+        message_variation_id STRING,
+        canvas_id STRING,
+        canvas_name STRING,
+        canvas_variation_id STRING,
+        canvas_step_id STRING,
+        canvas_step_message_variation_id STRING,
+        platform STRING,
+        os_version STRING,
+        device_model STRING,
+        send_id STRING,
+        device_id STRING,
+        button_action_type STRING,
+        button_string STRING
+        );
+```
+
+Then, create the AUTO continuous load pipe and specify
+1. which table to load and
+2. how to load the following table.
+
+```js
+CREATE OR REPLACE PIPE PIPE_USERS_MESSAGES_PUSHNOTIFICATION_OPEN
+                            auto_ingest=true
+COPY INTO "CURRENTS_PM"."PUBLIC".USERS_MESSAGES_PUSHNOTIFICATION_OPEN
+          FROM 
+           (select $1:id::STRING,
+            $1:user_id::STRING,
+            $1:external_user_id::STRING,
+            $1:time::INT,
+            $1:timezone::STRING,
+            $1:app_id::STRING,
+            $1:campaign_id::STRING,
+            $1:campaign_name::STRING,
+            $1:message_variation_id::STRING,
+            $1:canvas_id::STRING,
+            $1:canvas_name::STRING,
+            $1:canvas_variation_id::STRING,
+            $1:canvas_step_id::STRING,
+            $1:canvas_step_message_variation_id::STRING,
+            $1:platform::STRING,
+            $1:os_version::STRING,
+            $1:device_model::STRING,
+            $1:send_id::STRING,
+            $1:device_id::STRING,
+            $1:button_action_type::STRING,
+            $1:button_string::STRING from @currents.public.braze_data/currents/dataexport.prod-01.S3.integration.INTEGRATION_ID_GOES_HERE/event_type=users.messages.pushnotification.Open/);
+```
+{% alert warning %}
+You must repeat the CREATE TABLE and CREATE PIPE commands for every event type in your Currents Integration.
+{% endalert %}
+
+  {% endtab %}
+{% endtabs %}
+
+To see the types of analytics you can perform using Braze Currents, please consult [our Looker Blocks](https://github.com/llooker?q=braze).
+
+{% alert note %}
+Reach out to your Braze Account Manager if you have any questions or if you’re interested in having Braze guide you through this process.
+{% endalert %}
+
+
+[1]: {% image_buster /assets/img/aws-properties.png %}
+[2]: {% image_buster /assets/img/aws-events.png %}
diff --git a/_docs/_partners/braze_currents/data_storage_events/event_delivery_sematics.md b/_docs/_partners/braze_currents/data_storage_events/event_delivery_sematics.md
index 8ca2ce6f73..cf86f14d18 100644
--- a/_docs/_partners/braze_currents/data_storage_events/event_delivery_sematics.md
+++ b/_docs/_partners/braze_currents/data_storage_events/event_delivery_sematics.md
@@ -35,7 +35,7 @@ Currents will create a file for each event type using the format below:
 <your-bucket-prefix>/dataexport.<cluster-identifier>.S3.integration.<integration-id>/event_type=<event-type>/date=<date>/<schema-id>/<zone>/dataexport.<cluster-identifier>.S3.integration.<integration-id>+<partition>+<offset>.avro
 ```
 
-_Can't see the code because of the scroll bar? See how to fix that [here]({{ site.baseurl }}/help/help_articles_docs/scroll_bar_overlap/)._
+_Can't see the code because of the scroll bar? See how to fix that [here]({{ site.baseurl }}/help/help_articles/docs/scroll_bar_overlap/)._
 
 |Filename Segment |Definition|
 |---|---|
@@ -50,7 +50,7 @@ _Can't see the code because of the scroll bar? See how to fix that [here]({{ sit
 | `<offset>`| For internal use by Braze. Integer. |
 
 {% alert tip %}
-File naming conventions may change in the future, Braze recommends searching all keys in your bucket that have a prefix of <your-bucket-prefix>.
+File naming conventions may change in the future, Braze recommends searching all keys in your bucket that have a prefix of &lt;your-bucket-prefix&gt;.
 {% endalert %}
 
 Data files will be written to your storage bucket at set thresholds:
diff --git a/_docs/_partners/braze_currents/integration/available_partners.md b/_docs/_partners/braze_currents/integration/available_partners.md
index dd76734919..a3ef2acd2c 100644
--- a/_docs/_partners/braze_currents/integration/available_partners.md
+++ b/_docs/_partners/braze_currents/integration/available_partners.md
@@ -35,7 +35,7 @@ These partners specialize in product analytics and business intelligence and can
 
 
 
-[1]: {{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3_for_currents/
+[1]: {{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3/
 [2]: {{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents/
 [3]: {{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/microsoft_azure_blob_storage_for_currents/
 [4]: {{ site.baseurl }}/partners/technology_partners/insights/behavioral_analytics/amplitude_for_currents/
diff --git a/_docs/_partners/home.md b/_docs/_partners/home.md
index 7cbbfa3288..b3ca3b892b 100644
--- a/_docs/_partners/home.md
+++ b/_docs/_partners/home.md
@@ -60,6 +60,12 @@ valid_partner_list:
   url: /docs/partners/technology_partners/insights/business_intelligence/looker/
 - name: Apteligent
   url: /docs/partners/technology_partners/insights/crash_analytics/apteligent/
+- name: Taxi for Email
+  url: /docs/partners/technology_partners/channel_extensions/email_orchestration/taxi_for_email/
+- name: Stripo
+  url: /docs/partners/technology_partners/channel_extensions/email_orchestration/Stripo/
+- name: Stensul
+  url: /docs/partners/technology_partners/channel_extensions/email_orchestration/stensul/
 - name: Segment
   url: /docs/partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/segment/
   alt:
@@ -79,14 +85,14 @@ valid_partner_list:
   url: /docs/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/microsoft_azure_blob_storage_for_currents/
 - name: Amazon S3
   url: /docs/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3/
-  alt:
-    - title: Currents
-      url: /docs/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3_for_currents/
 - name: Amplitude
   url: /docs/partners/braze_currents/data_partner_integrations/amplitude/about/
 - name: Google Cloud Storage
   title: Currents
   url: /docs/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents/
+- name: Zapier
+  url: /docs/partners/technology_partners/channel_extensions/workflow_automation/zapier_integration/
+
 
 
 ---
diff --git a/_docs/_partners/technology_partners/additional_channels/direct_mail/inkit.md b/_docs/_partners/technology_partners/additional_channels/direct_mail/inkit.md
new file mode 100644
index 0000000000..9019f42cbd
--- /dev/null
+++ b/_docs/_partners/technology_partners/additional_channels/direct_mail/inkit.md
@@ -0,0 +1,85 @@
+---
+nav_title: Inkit
+alias: /partners/inkit/
+---
+
+# Inkit Direct Mail Integration
+
+[Inkit][1] enables you to save time and effort by automating your direct mail campaigns and bring offline customers back online. You can access Inkit's services through Braze's webhook feature and send mail to your users.
+
+
+## Requirements
+
+|Requirement| Origin| Access| Description|
+| ---| ---| ---|
+| Inkit API Key | Inkit | [Inkit Dashboard](https://app.inkit.io/#/account/api) | This key will enable you to connect your Braze and Inkit accounts.|
+| Inkit Template ID | Inkit | Found within the URL for each template. | This key will enable you to send your template to Braze. <br> Within the URL `https://app.inkit.io/#/templates/design/bd9b0b8c-c47b-40ae-8787-80dd76f6d2bb`, the Template ID is `bd9b0b8c-c47b-40ae-8787-80dd76f6d2bb`. |
+| HTTP Header | Inkit | Inkit Account | You will combine this with your Inkit API Key to authorize the connection as a key value pair within your Braze template. |
+
+
+## Integration
+
+You will need to use both your Inkit and Braze accounts to use the Inkit integration.
+
+### Step 1: Create a Webhook Template in Braze
+
+You can create this from the `Templates & Media` section, or create a new Webhook Campaign in Braze.
+
+![Inkit_Webhook_Template][7]
+
+Click on `New Template`. Then, add your `HTTP Header` into the `Webhook URL` field.
+
+Choose "Raw Text" from the `Request Body` drop down. A new field should appear.
+
+### Step 2: Fill Out Your Template
+
+Insert the following text into the new field. Each of these fields are required.
+
+```json
+{% raw %}
+{
+  "api_token": "INKIT_API_TOKEN",
+  "template_id": "INKIT_TEMPLATE_ID",
+  "email": "{{${email_address}}}",
+  "first_name": "{{${first_name}}}",
+  "last_name": "{{${last_name}}}",
+  "address": "{{custom_attribute.${address}}}",
+  "address2": "{{custom_attribute.${address2}}}",
+  "city": "{{${city}}}",
+  "country": "{{${country}}}",
+  "state": "{{custom_attribute.${state}}}",
+  "zip": "{{custom_attribute.${zip}}}"
+}
+{% endraw %}
+```
+Replace the necessary fields with the correct information - specifically `INKIT_API_TOKEN` and `INKIT_TEMPLATE_ID`.
+
+![Inkit Integration][5]{: height="70%" width="70%"}
+
+
+### Step 3: Preview Your Request
+
+You will see that your raw text automatically highlights if it is an applicable Braze tag. You must have `address`, `address2`, `state`, and `zip` set up as [custom attributes][3] to send this Webhook.
+
+You should be able to preview your request in the left-hand panel, or navigate to the `Test` tab, where you can select a random user, an existing user, or customize your own to test your webhook.
+
+{% alert important %}
+Remember to save your template before leaving the page!
+{% endalert %}
+
+See Inkit's integration docs [here][2].
+
+## Usage
+
+If you hadn't created this in `Templates & Media`, you can go to `Campaigns`, then click `+ Create Campaign`. Select "Webhook" and choose your template from the "Saved Webhook Template" list. Create your [Webhook][6]!
+
+![Inkit Usage][4]{: height="70%" width="70%"}
+
+
+[1]: https://inkit.io/
+[2]: http://support.inkit.io/integrations/braze-inkit-integration
+[3]: {{ site.baseurl }}/user_guide/data_and_analytics/custom_data/custom_attributes/#custom-attributes
+[4]: {% image_buster /assets/img/inkit-use.png %}
+[5]: {% image_buster /assets/img/inkit-integration.png %}
+[6]: {{ site.baseurl }}/user_guide/message_building_by_channel/webhooks/creating_a_webhook/
+[7]: {% image_buster /assets/img/inkit-webhook-template.png %}
diff --git a/_docs/_partners/technology_partners/additional_channels/direct_mail/lob.md b/_docs/_partners/technology_partners/additional_channels/direct_mail/lob.md
index 9d853c3ca0..0a274b352b 100644
--- a/_docs/_partners/technology_partners/additional_channels/direct_mail/lob.md
+++ b/_docs/_partners/technology_partners/additional_channels/direct_mail/lob.md
@@ -17,7 +17,7 @@ The HTTP URL to request in the webhook is different for each action you can make
 
 ## Request Body
 
-To specify an address in the webhook body requires nested objects, and as such it must be entered as "Raw Text" in JSON format.  If you are unfamiliar with the [JSON format][41], an easy way to generate a sample request body is to copy the example CURL requests given on the Lob.com documentation and run it in your terminal (replacing their test API key with yours).  Once you run the code in terminal, go to the Lob.com dashboard and check the "Logs" tab found under the "Requests" title.  If the API request worked, you will be able to click on the request and copy the request body into the dashboard.  You can then replace the data in the file to fit your desires.
+To specify an address in the webhook body requires nested objects, and as such it must be entered as "Raw Text" in JSON format.  If you are unfamiliar with the JSON format, an easy way to generate a sample request body is to copy the example CURL requests given on the Lob.com documentation and run it in your terminal (replacing their test API key with yours).  Once you run the code in terminal, go to the Lob.com dashboard and check the "Logs" tab found under the "Requests" title.  If the API request worked, you will be able to click on the request and copy the request body into the dashboard.  You can then replace the data in the file to fit your desires.
 
 ![Lob Success Response][34]
 
diff --git a/_docs/_partners/technology_partners/additional_channels/sms/telesign.md b/_docs/_partners/technology_partners/additional_channels/sms/telesign.md
index d8e7d0982a..87d0d4c3c0 100644
--- a/_docs/_partners/technology_partners/additional_channels/sms/telesign.md
+++ b/_docs/_partners/technology_partners/additional_channels/sms/telesign.md
@@ -16,6 +16,10 @@ To use TeleSign’s SMS web service to send a request, you’ll need to use the
 https://rest-api.telesign.com/v1/messaging
 ```
 
+{% alert important %}
+Customers using Telesign's SMS product will need to [purchase a number](https://standard.telesign.com/api-reference/additional-features/inbound-sms#buy-a-phone-number-sender-id) from them.
+{% endalert %}
+
 ### Step 1: Set Up Your Request Body
 
 The TeleSign API expects the request body to be URL-encoded, so you must change the request type in the Braze Webhook composer to Raw Text. The required parameters for the body of the request are Phone Number (phone_number), Message (message), and Message Type (message_type). You’ll need to have _valid_ phone numbers on each user profile in your target audience. TeleSign defines a valid phone number as the end user's phone number _with country code included._
diff --git a/_docs/_partners/technology_partners/additional_channels/sms/wavecell.md b/_docs/_partners/technology_partners/additional_channels/sms/wavecell.md
index 3b6d70b0f8..5bd31a2dac 100644
--- a/_docs/_partners/technology_partners/additional_channels/sms/wavecell.md
+++ b/_docs/_partners/technology_partners/additional_channels/sms/wavecell.md
@@ -5,7 +5,7 @@ hidden: true
 ---
 
 # Wavecell
-With Wavecell's cloud communication platform, businesses and developers alike can incorporate SMS functionality into their user engagement strategies. Utilizing SMS and Wavecell, not only is two factor authentication feasible, but with the help of [Key-Value Pairs]({{ site.baseurl }}/user_guide/personalization_and_dynamic_content/key_value_pairs/) and [Webhooks]({{ site.baseurl }}/user_guide/message_building_by_channel/webhooks/creating_a_webhook/), so are interactive stories and endless possibilities.
+With Wavecell's cloud communication platform, businesses and developers alike can incorporate SMS functionality into their user engagement strategies. Utilizing SMS and Wavecell, not only is two factor authentication feasible, but with the help of [Key-Value Pairs]({{ site.baseurl }}/user_guide/personalization_and_dynamic_content/key_value_pairs/) and [Webhooks]({{ site.baseurl }}/user_guide/message_building_by_channel/webhooks/creating_a_webhook/), so are interactive stories and endless possibilities. 
 
 # Pre-Requisites
 
diff --git a/_docs/_partners/technology_partners/advertising_technologies/attribution/appsflyer.md b/_docs/_partners/technology_partners/advertising_technologies/attribution/appsflyer.md
index 3d85bc30bc..cb29d964f6 100644
--- a/_docs/_partners/technology_partners/advertising_technologies/attribution/appsflyer.md
+++ b/_docs/_partners/technology_partners/advertising_technologies/attribution/appsflyer.md
@@ -13,6 +13,10 @@ Build more holistic marketing campaigns by leveraging mobile install attribution
 
 __Step 1: Integration Requirements__
 
+{% alert important %}
+As of March 4th, 2019, AppsFlyer requires that the Activate Partner toggle be switched to "on" for every integrated partner, including Braze. Please be sure that your toggle is flipped on from your AppsFlyer dashboard.
+{% endalert %}
+
 * This integration supports iOS and Android apps.
 * If you expect more than 100 attributed installs per hour, you will need a Braze Enterprise account. See [API Restrictions][5] for more information.
 * Your app will need Braze's SDK and AppsFlyer's SDK installed.
@@ -28,7 +32,7 @@ AppsFlyerLib.setAdditionalData(customData);
 
 __Step 2: Getting the Braze API Key__
 
-In Braze's Dashboard, navigate to ["Technology Partners" , then "Attribution"][14] and find the API key and REST Endpoint in the AppsFlyer section. The API key and the REST Endpoint are used in the next step when setting up a postback in Appsflyer's dashboard.
+In your Braze account, navigate to "Technology Partners" , then "Attribution" and find the API key and REST Endpoint in the AppsFlyer section. The API key and the REST Endpoint are used in the next step when setting up a postback in Appsflyer's dashboard.
 
 __Step 3: Configure Braze in Appsflyer's Dashboard__
 
@@ -56,7 +60,6 @@ Once Braze receives attribution data from AppsFlyer, the status connection indic
 
 [5]: #api-restrictions
 [13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/optional_idfa_collection/#optional-idfa-collection
-[14]: https://dashboard-01.braze.com/integrations/third_party_integrations/attribution "Attribution Integrations"
 [15]: https://docs.adjust.com/en/callbacks/ "Adjust Callbacks"
 [16]: https://support.appsflyer.com/hc/en-us/articles/115001603343-AppsFlyer-Appboy-Integration "AppsFlyer Push API"
 [17]: http://support.apsalar.com/customer/portal/articles/1503188-creating-and-managing-postbacks "Singular Postbacks"
diff --git a/_docs/_partners/technology_partners/advertising_technologies/attribution/branch_for_attribution.md b/_docs/_partners/technology_partners/advertising_technologies/attribution/branch_for_attribution.md
index 543e0cac4f..887347ba98 100644
--- a/_docs/_partners/technology_partners/advertising_technologies/attribution/branch_for_attribution.md
+++ b/_docs/_partners/technology_partners/advertising_technologies/attribution/branch_for_attribution.md
@@ -28,7 +28,7 @@ Branch.initSession(...);
 
 ### Step 2: Getting the Attribution ID
 
-In Braze's Dashboard, navigate to ["Technology Partners" , then "Attribution"][14] and find the API key and REST Endpoint in the Branch section. The API key and the REST Endpoint are used in the next step when setting up a webhook in Branch's dashboard.
+In your Braze account, navigate to "Technology Partners" , then "Attribution" and find the API key and REST Endpoint in the Branch section. The API key and the REST Endpoint are used in the next step when setting up a webhook in Branch's dashboard.
 
 ### Step 3: Setting Up A Webhook from Branch
 
@@ -36,9 +36,8 @@ Follow [these instructions][22] to add a webhook in Branch's dashboard. You will
 
 ### Step 4: Confirming the Integration
 
-Once Braze receives attribution data from Branch, the status connection indicator on ["Technology Partners" , then "Attribution"][14] will change to green and a timestamp of the last successful request will be included. Note that this will not happen until we receive data about an __attributed__ install. Organic installs are ignored by our API and are not counted when determining if a successful connection was established.
+Once Braze receives attribution data from Branch, the status connection indicator on "Technology Partners" , then "Attribution" will change to green and a timestamp of the last successful request will be included. Note that this will not happen until we receive data about an __attributed__ install. Organic installs are ignored by our API and are not counted when determining if a successful connection was established.
 
 [5]: {{ site.baseurl }}/developer_guide/rest_api/basics/#api-limits
 [13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/optional_idfa_collection/#optional-idfa-collection "IDFA Collection"
-[14]: https://dashboard-01.braze.com/integrations/third_party_integrations/attribution "Attribution Integrations"
 [22]: https://docs.branch.io/pages/exports/ua-webhooks/ "Branch Webhooks"
diff --git a/_docs/_partners/technology_partners/advertising_technologies/attribution/kochava.md b/_docs/_partners/technology_partners/advertising_technologies/attribution/kochava.md
index b0f123b2a9..7c34eed72f 100644
--- a/_docs/_partners/technology_partners/advertising_technologies/attribution/kochava.md
+++ b/_docs/_partners/technology_partners/advertising_technologies/attribution/kochava.md
@@ -47,7 +47,7 @@ mobileAppTracker.setUserId(Appboy.getInstance(MyActivity.this).getInstallTrackin
 
 __Step 2: Getting the Postback URL__
 
-In Braze's Dashboard, navigate to ["Technology Partners" , then "Attribution"][14] and find the Postback URL in the MobileAppTracking section. This url represents the api endpoint that an attribution partner will send data to. You will need this url in the next step when setting up a callback in Tune's dashboard.
+In your Braze account, navigate to "Technology Partners" , then "Attribution" and find the Postback URL in the MobileAppTracking section. This url represents the api endpoint that an attribution partner will send data to. You will need this url in the next step when setting up a callback in Tune's dashboard.
 
 __Step 3: Setting Up A Postback from Tune__
 
@@ -68,7 +68,6 @@ Once Braze receives attribution data from Tune, the status connection indicator
 
 [5]: #api-restrictions
 [13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/#optional-idfa-collection
-[14]: https://dashboard-01.braze.com/integrations/third_party_integrations/attribution "Attribution Integrations"
 [15]: https://docs.adjust.com/en/callbacks/ "Adjust Callbacks"
 [16]: https://support.appsflyer.com/hc/en-us/articles/115001603343-AppsFlyer-Appboy-Integration "AppsFlyer Push API"
 [17]: http://support.apsalar.com/customer/portal/articles/1503188-creating-and-managing-postbacks "Singular Postbacks"
diff --git a/_docs/_partners/technology_partners/advertising_technologies/attribution/singular.md b/_docs/_partners/technology_partners/advertising_technologies/attribution/singular.md
index 26669c27b7..9304fa2861 100644
--- a/_docs/_partners/technology_partners/advertising_technologies/attribution/singular.md
+++ b/_docs/_partners/technology_partners/advertising_technologies/attribution/singular.md
@@ -7,7 +7,7 @@ alias: /partners/singular/
 
 Singular is a unified marketing analytics platform that delivers attribution, cost aggregation, creative reporting, and workflow automation.
 
-Singular allows you to import paid install attribution data to segment more intelligently within your lifecycle campaigns. 
+Singular allows you to import paid install attribution data to segment more intelligently within your lifecycle campaigns.
 
 
 
@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState)
 
 __Step 2: Getting the Braze API Key__
 
-In Braze's Dashboard, navigate to ["Technology Partners" , then "Attribution"][14] and find the API key and REST Endpoint in the Singular section. You will need to provide the API key and the REST Endpoint to your Singular Account Manager for the integration to be completed.
+In your Braze account, navigate to "Technology Partners" , then "Attribution" and find the API key and REST Endpoint in the Singular section. You will need to provide the API key and the REST Endpoint to your Singular Account Manager for the integration to be completed.
 
 __Step 3: Confirming the Integration__
 
@@ -54,7 +54,7 @@ __Step 1: Integration Requirements__
 
 __Step 2: Getting the Attribution ID__
 
-In Braze's Dashboard, navigate to ["Technology Partners" , then "Attribution"][14] and find the API key and REST Endpoint in the Kochava section. The API key and the REST Endpoint are used in the next step when setting up a postback in Kochava's dashboard.
+In your Braze account, navigate to "Technology Partners" , then "Attribution" and find the API key and REST Endpoint in the Kochava section. The API key and the REST Endpoint are used in the next step when setting up a postback in Kochava's dashboard.
 
 __Step 3: Setting Up A Postback from Kochava__
 
@@ -81,7 +81,7 @@ mobileAppTracker.setUserId(Appboy.getInstance(MyActivity.this).getInstallTrackin
 
 __Step 2: Getting the Postback URL__
 
-In Braze's Dashboard, navigate to ["Technology Partners" , then "Attribution"][14] and find the Postback URL in the MobileAppTracking section. This url represents the api endpoint that an attribution partner will send data to. You will need this url in the next step when setting up a callback in Tune's dashboard.
+In your Braze account, navigate to "Technology Partners" , then "Attribution" and find the Postback URL in the MobileAppTracking section. This url represents the api endpoint that an attribution partner will send data to. You will need this url in the next step when setting up a callback in Tune's dashboard.
 
 __Step 3: Setting Up A Postback from Tune__
 
@@ -102,7 +102,6 @@ Once Braze receives attribution data from Tune, the status connection indicator
 
 [5]: #api-restrictions
 [13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/#optional-idfa-collection
-[14]: https://dashboard-01.braze.com/integrations/third_party_integrations/attribution "Attribution Integrations"
 [15]: https://docs.adjust.com/en/callbacks/ "Adjust Callbacks"
 [16]: https://support.appsflyer.com/hc/en-us/articles/115001603343-AppsFlyer-Appboy-Integration "AppsFlyer Push API"
 [17]: http://support.apsalar.com/customer/portal/articles/1503188-creating-and-managing-postbacks "Singular Postbacks"
diff --git a/_docs/_partners/technology_partners/advertising_technologies/attribution/tune.md b/_docs/_partners/technology_partners/advertising_technologies/attribution/tune.md
index 57f5deafa8..7bfe4f1564 100644
--- a/_docs/_partners/technology_partners/advertising_technologies/attribution/tune.md
+++ b/_docs/_partners/technology_partners/advertising_technologies/attribution/tune.md
@@ -25,7 +25,7 @@ mobileAppTracker.setUserId(Appboy.getInstance(MyActivity.this).getInstallTrackin
 
 __Step 2: Getting the Postback URL__
 
-In Braze's Dashboard, navigate to ["Technology Partners" , then "Attribution"][14] and find the Postback URL in the MobileAppTracking section. This url represents the api endpoint that an attribution partner will send data to. You will need this url in the next step when setting up a callback in Tune's dashboard.
+In your Braze account, navigate to "Technology Partners" , then "Attribution"and find the Postback URL in the MobileAppTracking section. This url represents the api endpoint that an attribution partner will send data to. You will need this url in the next step when setting up a callback in Tune's dashboard.
 
 __Step 3: Setting Up A Postback from Tune__
 
@@ -46,7 +46,6 @@ Once Braze receives attribution data from Tune, the status connection indicator
 
 [5]: #api-restrictions
 [13]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/#optional-idfa-collection
-[14]: https://dashboard-01.braze.com/integrations/third_party_integrations/attribution "Attribution Integrations"
 [15]: https://docs.adjust.com/en/callbacks/ "Adjust Callbacks"
 [16]: https://support.appsflyer.com/hc/en-us/articles/115001603343-AppsFlyer-Appboy-Integration "AppsFlyer Push API"
 [17]: http://support.apsalar.com/customer/portal/articles/1503188-creating-and-managing-postbacks "Singular Postbacks"
diff --git a/_docs/_partners/technology_partners/channel_extensions/deep_linking/branch_for_deeplinking.md b/_docs/_partners/technology_partners/channel_extensions/deep_linking/branch_for_deeplinking.md
index 3cff93c68e..6b140e2585 100644
--- a/_docs/_partners/technology_partners/channel_extensions/deep_linking/branch_for_deeplinking.md
+++ b/_docs/_partners/technology_partners/channel_extensions/deep_linking/branch_for_deeplinking.md
@@ -33,7 +33,7 @@ Depending on your ESP, additional customization is required in order to support
 
 [1]: https://branch.io/
 [2]: {{ site.baseurl }}/partners/branch_for_attribution/
-[3]: https://dev.branch.io/getting-started/universal-app-links/overview/
+[3]: https://docs.branch.io/pages/deep-linking/universal-links/#search
 [4]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/advanced_use_cases/linking/#linking-customization
-[5]: https://dev.branch.io/marketing-channels/sendgrid/overview/
-[6]: https://dev.branch.io/marketing-channels/mailjet/overview/
+[5]: https://docs.branch.io/pages/emails/braze/
+[6]: https://docs.branch.io/pages/emails/braze-mailjet/
diff --git a/_docs/_partners/technology_partners/channel_extensions/email_orchestration.md b/_docs/_partners/technology_partners/channel_extensions/email_orchestration.md
new file mode 100644
index 0000000000..777a97577a
--- /dev/null
+++ b/_docs/_partners/technology_partners/channel_extensions/email_orchestration.md
@@ -0,0 +1,6 @@
+---
+nav_title: Email Orchestration
+config_only: true
+layout: blank_config
+page_order: 8
+---
\ No newline at end of file
diff --git a/_docs/_partners/technology_partners/channel_extensions/email_orchestration/stensul.md b/_docs/_partners/technology_partners/channel_extensions/email_orchestration/stensul.md
new file mode 100644
index 0000000000..46cc9d100b
--- /dev/null
+++ b/_docs/_partners/technology_partners/channel_extensions/email_orchestration/stensul.md
@@ -0,0 +1,39 @@
+---
+nav_title: Stensul
+alias: /partners/stensul
+---
+
+# Stensul
+
+[Stensul](https://stensul.com/) empowers email marketers to easily create mobile-responsive emails across channels, at scale.
+
+Build responsive, on-brand emails in Stensul before sending them downstream to Braze, in real-time, for segmentation and targeting.
+
+# Requirements
+
+Requirement   | Source | Description
+--------------|--------| -----
+Braze API Key | [Braze Platform](https://dashboard.braze.com/sign_in) | The API key must have the *Template's* permission enabled before use.
+
+# Integration
+
+The export functionality from Stensul to Braze will allow users to send your HTML-formatted email as a new template within the Braze platform.
+
+Braze is integrated directly into the Stensul platform. Thus, after providing your Stensul Customer Success team with your Braze API key and cluster instance, the integration will be set up for you, allowing to you to push your completed email from Stensul to Braze as outlined below.
+
+## Step 1
+Once the email is created in Stensul, click “Complete”.
+![Stensul Save Options]({% image_buster /assets/img_archive/stensul_save_options.png %})
+
+## Step 2
+Select the **Upload to Braze** option on the Completion page, as shown below.
+![Stensul Upload Options]({% image_buster /assets/img_archive/stensul_upload_options.png %})
+
+## Step 3
+Enter the `template name`, `subject`, and `preheader` for your email. Then, select **Upload**. You will then receive a confirmation that the upload was successful and a history of past uploads of the file if applicable.
+![Stensul Upload Success]({% image_buster /assets/img_archive/stensul_upload_success.png %})
+
+# Usage
+To use this integration, look for your new email template in [Templates & Media > Email Templates][1] in your Braze account, or begin to create your email and choose your template from those presented.  
+
+[1]: {{ site.baseurl }}/user_guide/message_building_by_channel/email/creating_an_email_template/
diff --git a/_docs/_partners/technology_partners/channel_extensions/email_orchestration/stripo.md b/_docs/_partners/technology_partners/channel_extensions/email_orchestration/stripo.md
new file mode 100644
index 0000000000..ae6e65fb75
--- /dev/null
+++ b/_docs/_partners/technology_partners/channel_extensions/email_orchestration/stripo.md
@@ -0,0 +1,40 @@
+---
+nav_title: Stripo
+alias: /partners/stripo
+---
+
+# Stripo
+
+[Stripo](https://stripo.email/) is a Drag-n-Drop email template builder that helps create sophisticated emails in no time due to workflow automation. Design responsive emails, setting which elements to display/hide on various devices, add interactive elements to emails right in the Stripo editor. The HTML code editor allows working with pure code to design unique emails.
+
+Create emails with Stripo faster with its comprehensive Drag-n-Drop editor and set of basic blocks. Embed custom HTML code with interactive elements. Then export those emails to Braze in 2 clicks, where you finalize them — personalize, add contact information prior to running email campaigns and track conversions after. Combine the tools for easy, productive communication with clients.
+
+# Requirements
+
+Requirement   | Source | Description
+--------------|--------| -----
+Braze API Key | [Braze Platform](https://dashboard.braze.com/sign_in) | The API key must have the *Template's* permission enabled before use.
+
+# Integration Usage
+
+The export functionality from Stripo to Braze will allow users to send the HTML as a new template within the Braze platform.
+
+## Step 1
+Once you have finished editing your email, click **export** located at the top next to the name field.
+![Stripo Export]({% image_buster /assets/img_archive/stripo_export.png %})
+
+## Step 2
+Select **Braze** as your method of export.
+
+## Step 3
+Enter your `account name` (i.e `Appgroup name`), `API key` and your `cluster instance`.
+![Stripo Form]({% image_buster /assets/img_archive/stripo_form.png %})
+
+{% alert important %}
+This is a one-time setup and any exports in the future will automatically utilize this API key.
+{% endalert %}
+
+# Usage
+To use this integration, look for your new email template in [Templates & Media > Email Templates][1] in your Braze account, or begin to create your email and choose your template from those presented.  
+
+[1]: {{ site.baseurl }}/user_guide/message_building_by_channel/email/creating_an_email_template/
diff --git a/_docs/_partners/technology_partners/channel_extensions/email_orchestration/taxi_for_email.md b/_docs/_partners/technology_partners/channel_extensions/email_orchestration/taxi_for_email.md
new file mode 100644
index 0000000000..4bda656a84
--- /dev/null
+++ b/_docs/_partners/technology_partners/channel_extensions/email_orchestration/taxi_for_email.md
@@ -0,0 +1,52 @@
+---
+nav_title: Taxi for Email
+alias: /partners/taxi_for_email
+---
+
+# Taxi for Email
+
+[Taxi For Email](http://taxiforemail.com/) is an online email marketing tool that encourages teams to easily collaborate on email campaigns. It allows teams to produce accurate and on brand emails at a large scale in less time.
+
+Taxi For Email can help Braze customers create intelligent email templates using our simple yet powerful syntax. With our easy-to-use drag and drop visual editor, copywriters and editors can  build emails without needing to know HTML code. Using Taxi can help empower teams to do their best work by assigning access and setting permissions for team members. Once emails are ready to go Braze customers can export send-ready code from Taxi and upload into Braze.
+
+
+# Requirements
+
+Requirement   | Source | Notes
+--------------|--------| -----
+Braze API Key | [Braze Platform](https://dashboard.braze.com/sign_in) | The API key must have the *Template's* permission enabled before use.
+
+# Integration
+
+The export functionality from Taxi For Email to Braze will allow users to send the HTML as a new template within the Braze platform.
+
+To set up the Braze connector, you'll need to be logged into both your Braze and Taxi accounts.
+
+## Step 1
+In Taxi, navigate to your **Organization Settings** and select the **ESP Connectors** tab.
+
+## Step 2
+Click the **Add New** button and select "Braze" from the dropdown.
+
+{% alert important %}
+This will need to be enabled by Taxi. You will also need to name your new connector - we recommend titling the connector `Braze`.
+{% endalert %}
+
+## Step 3
+Click **Braze** to edit the Connector Settings.
+
+## Step 4
+Select the **Endpoint** to send the template to. This can be found in the URL of your Braze account **e.g dashboard-03**.
+
+## Step 5
+Lastly, add your *templates enabled* Braze API key. This can be found under the **Developer Console** in your Braze account.
+The field should now turn green if the details are accepted.
+
+{% alert important %}
+If the field is not green, please make sure that the **Templates** section checkboxes are all checked for your API Key, and verify that the specified **API Key** and **Endpoint** are both correct.
+{% endalert %}
+
+# Usage
+To use this integration, look for your new email template in [Templates & Media > Email Templates][1] in your Braze account, or begin to create your email and choose your template from those presented.  
+
+[1]: {{ site.baseurl }}/user_guide/message_building_by_channel/email/creating_an_email_template/
diff --git a/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/mparticle.md b/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/mparticle.md
index 66a1043a8b..95ebeb1dd1 100644
--- a/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/mparticle.md
+++ b/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/mparticle.md
@@ -62,8 +62,8 @@ Integrate the appropriate Braze SDKs into your app based on your messaging needs
 | API Key | Found in App Settings under the Manage App Group. |
 | External Identity Type | The mParticle User Identity type to forward as an External ID to Braze. We recommend leaving this to the default value, Customer ID. |
 | Braze Instance | Select Custom. |
-| Custom SDK Endpoint | Given to you by your Braze support or account representative. For example: https://sdk.api.braze.com. If you were not given a custom API Endpoint, leave this setting blank. |
-|Custom REST Endpoint | Given to you by your Braze support or account representative. For example: https://rest.iad.braze.com. If you know which Braze Instance you’re on, you can find your endpoint here. |
+| Custom SDK Endpoint | Given to you by your Braze support or account representative. For example: `https://sdk.api.braze.com`. If you were not given a custom API Endpoint, leave this setting blank. |
+|Custom REST Endpoint | Given to you by your Braze support or account representative. For example: `https://rest.iad.braze.com`. If you know which Braze Instance you’re on, you can find your endpoint [here]({{ site.baseurl }}/developer_guide/rest_api/basics/#endpoints). |
 | Custom Javascript Endpoint | Same as Custom SDK endpoint. |
 
 {% alert important %}
diff --git a/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/tealium.md b/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/tealium.md
index 3e300a4681..813ce3a1cd 100644
--- a/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/tealium.md
+++ b/_docs/_partners/technology_partners/data_and_infrastructure_agility/customer_data_platform/tealium.md
@@ -32,5 +32,5 @@ To customize your integration (like logging custom events or custom attributes),
 * To customize when the Braze SDK is loaded, click on the __Load Rules__ tab of your Tealium dashboard, then choose on which pages the SDK should initialize.
 
 {% alert warning %}
-If the data layer is not configured correctly, or you incorrectly enter your Custom Endpoint, your integration may fail or not return correct results. Your Custom Endpoint should take the format of https://companyendpointhere.braze.eu/api/v3.
+If the data layer is not configured correctly, or you incorrectly enter your [Custom Endpoint]({{ site.baseurl }}/developer_guide/rest_api/basics/#endpoints), your integration may fail or not return correct results.
 {% endalert %}
diff --git a/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3.md b/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3.md
index 81336c7cd9..0ad664224c 100644
--- a/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3.md
+++ b/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3.md
@@ -6,47 +6,66 @@ page_order: 1
 
 # Amazon S3 Integration
 
-Follow the instructions on this page to get started with your AWS S3 integration. AWS S3 integration is required for advanced data export functionality.
+[Amazon S3](https://aws.amazon.com/s3/) is a highly scalable storage system offered by Amazon Web Services. Braze has two different integration strategies with Amazon S3 - one for [Braze Currents]({{ site.baseurl }}/partners/braze_currents/about/) and one for all Dashboard data exports (CSV exports, Engagement Reports, etc.) Both integrations support two different authentication/authorization methods:
 
-If you're looking for information on the Currents integration with AWS S3, [click here]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3_for_currents/).
+- [AWS Secret Access Key method](#aws-secret-key-auth-method)
+- [AWS Role ARN method](#aws-role-arn-auth-method)
 
-## Obtaining Amazon S3 Credentials
+{% alert important %}
+The AWS Role ARN method is currently in limited release. Please contact your Account Manager if you are interested in using this feature.
+{% endalert %}
 
-If you already have an S3 bucket, we still recommend creating a new bucket for Braze so you can limit permissions.
+Follow the instructions on this page to get started with your AWS S3 integration. If you already have an S3 bucket, we still recommend creating a new bucket __specifically for Braze__ so you can limit permissions.
 
-#### Step 1 {#S3-1}
+1.  To create a bucket for your app, open the [Amazon S3 console](https://console.aws.amazon.com/s3/) and follow the instructions to __Sign in__ or __Create an Account with AWS__.
+2.  Once signed in, select "S3" from the "Storage & Content Delivery" category.
+3.  Select "Create Bucket" on the next screen and you"ll be prompted to create your bucket and select a region.
 
-To create a bucket for your app, open the [Amazon S3 console][6] and follow the instructions to Sign in or Create an Account with AWS.
+## AWS Secret Key auth method
 
-#### Step 2 {#S3-2}
+This authentication method generates a __Secret Key__ and an __Access Key ID__ that enables Braze to authenticate as a user on your AWS account for the purposes of writing data to your bucket.
 
-Once signed in, select 'S3' from the 'Storage & Content Delivery' Category.
+### Step 1 - Create User {#secret-key-1}
 
-![S3 Creds][7]
+To retrieve your __Access Key ID__ and __Secret Access Key__, you’ll need to [create an __IAM User__ and __Administrators Group__ in AWS](https://docs.aws.amazon.com/IAM/latest/UserGuide/getting-started_create-admin-group.html).
 
-#### Step 3 {#S3-3}
+### Step 2 - Get Credentials {#secret-key-2}
 
-Select 'Create Bucket' on the next screen and you'll be prompted to create your bucket and select a region. [Click here][8] for information on Bucket Restrictions and Limitations, as well as naming conventions.
+Once a user has been created, click "Show User Security Credentials" so your __Access Key ID__ and __Secret Access Key__ will be revealed. Next, either note these credentials somewhere, or click the blue "Download Credentials" button as you will need to input these into the Braze dashboard later on.
 
-![Create Bucket][9]
-
-#### Step 4 {#S3-4}
-
-To retrieve your access ID and secret access key, you'll need to create your first IAM User and Administrators Group. Follow these [step-by-step instructions][10].
+![Secret Key][11]
 
-#### Step 5 {#S3-5}
+### Step 3 - Create Policy {#secret-key-3}
 
-Once a user has been created, please select 'Show User Security Credentials' so your Access Key ID and Secret Access Key will be revealed. Click the blue 'Download Credentials' button as you will need to input this into the Braze dashboard later on.
+Now, navigate to the __Policies__ tab in the navigation bar and select "Get Started" then "Create Policy". This will allow you to add permissions for your user. Select "Create Your Own Policy". This will give limited permissions so we only have the ability to access the bucket that you specify.
 
-![Secret Key][11]
+![Policy][12]
 
-#### Step 6 {#S3-6}
+Input the code below when creating your own policy. (Note that there are different policies required for "Currents" vs. "Dashboard Data Export".) Specify a "Policy Name" of your choice, and input the code below into the "Policy Document" section. Be sure to replace `INSERTBUCKETNAME` with your own bucket name.
 
-Now, you'll need to navigate to the Policies tab in the navigation bar and select 'Get Started' then 'Create Policy' which will allow you to add permissions for your user. Select 'Create Your Own Policy'. This will give limited permissions so we only have the ability to access the bucket that you specify.
+{% tabs %}
+{% tab Braze Currents %}
 
-![Policy][12]
+```json
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": ["s3:GetBucketLocation"],
+            "Resource": ["arn:aws:s3:::INSERTBUCKETNAME"]
+        },
+        {
+            "Effect": "Allow",
+            "Action": ["s3:PutObject", "s3:ListObject"],
+            "Resource": ["arn:aws:s3:::INSERTBUCKETNAME*", "arn:aws:s3:::INSERTBUCKETNAME/", "arn:aws:s3:::INSERTBUCKETNAME"]
+        }
+    ]
+}
+```
 
-Below is the code you need to input when creating your own policy. You will have to specify a 'Policy Name' of your choice, and input the code below into the 'Policy Document' section. Be sure to replace 'INSERTBUCKETNAME' with your own bucket name.
+{% endtab %}
+{% tab Dashboard Data Export %}
 
 ```json
 {
@@ -66,9 +85,12 @@ Below is the code you need to input when creating your own policy. You will have
 }
 ```
 
-#### Step 7 {#S3-7}
+{% endtab %}
+{% endtabs %}
+
+### Step 4 - Attach Policy {#secret-key-4}
 
-Once your policy has been created, you will need to select 'Users' and then click into your specifc user so you can attach this new policy. On the 'Permissions' tab, click 'Attach Policy'.
+Once your policy has been created, navigate to "Users" and then click into your specifc user so you can attach this new policy. On the "Permissions" tab, click "Attach Policy".
 
 ![Attach User][13]
 
@@ -76,23 +98,197 @@ Search for the new policy that you created and click to attach.
 
 You are now ready to link your AWS credentials to your Braze account.
 
-## Linking Braze to Amazon S3
+### Step 5 - Link Braze to AWS {#secret-key-5}
+
+{% tabs %}
+{% tab Braze Currents %}
+
+Navigate to the "Currents" page on the Braze Dashboard under the "Integrations" section, click the "Create Current" dropdown, and select "Amazon S3 Data Export".
+
+![AWS Creds]({{ site.baseurl }}/assets/img/currents-s3-example.png)
+
+Give your Current a name. Then, in the __Credentials__ section, make sure the "AWS Secret Access Key" radio button is selected, then input your __AWS Access ID__, __AWS Secret Access Key__, and __AWS S3 Bucket Name__ in the designated fields.
+
+You can also add the following customizations, based on your needs:
+
+-   Folder Path (defaults to `currents`)
+-   AES-256 Encryption (defaults to OFF)
+
+Click "Launch Current" to continue.
+
+A notification will inform you whether your credentials have been successfully validated. AWS S3 should now be set up for Braze Currents.
+
+{% endtab %}
+{% tab Dashboard Data Export %}
+
+Navigate to the "Technology Partners" page on the Braze Dashboard under the "Integrations" section and click on "Amazon S3".
+
+![AWS Creds]({{ site.baseurl }}/assets/img/s3_tech_partners.png)
+
+On the AWS Credentials page, make sure the "AWS Secret Access Key" radio button is selected, then input your AWS Access ID, AWS Secret Access Key, and AWS S3 Bucket Name in the designated fields. When inputting your secret key, click "Test Credentials" first to ensure your credentials work, then "Save" once this is successful.
+
+{% alert note %}
+You can always retrieve new credentials by navigating to your user and clicking "Create Access Key" on the Security Credentials Tab within the AWS Console.
+{% endalert %}
+
+A notification will inform you whether your credentials have been successfully validated. AWS S3 should now be integrated into your Braze account.
+
+{% endtab %}
+{% endtabs %}
+
+## AWS Role ARN auth method
+
+This authentication method generates a Role ARN (Amazon Resource Name) that enables Braze's Amazon account to authenticate as a member of the Role you created for the purposes of writing data to your bucket.
+
+### Step 1 - Create Policy {#role-arn-1}
+
+To get started, navigate to the IAM section of the AWS Console, click "Policies" in the navigation bar and click "Create Policy". 
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_policy_1_list.png)
+
+Open the "JSON" tab and input the code below into the “Policy Document” section. Be sure to replace INSERTBUCKETNAME with your own bucket name. Click "Review Policy" when you're finished.
+
+{% tabs %}
+{% tab Braze Currents %}
+
+```json
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": ["s3:GetBucketLocation"],
+            "Resource": ["arn:aws:s3:::INSERTBUCKETNAME"]
+        },
+        {
+            "Effect": "Allow",
+            "Action": ["s3:PutObject", "s3:ListObject"],
+            "Resource": ["arn:aws:s3:::INSERTBUCKETNAME/*"]
+        }
+    ]
+}
+```
+
+{% endtab %}
+{% tab Dashboard Data Export %}
+
+```json
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": ["s3:ListBucket", "s3:GetBucketLocation"],
+            "Resource": ["arn:aws:s3:::INSERTBUCKETNAME"]
+        },
+        {
+            "Effect": "Allow",
+            "Action": ["s3:GetObject", "s3:PutObject", "s3:DeleteObject"],
+            "Resource": ["arn:aws:s3:::INSERTBUCKETNAME/*"]
+        }
+    ]
+}
+```
+
+{% endtab %}
+{% endtabs %}
+
+Next, give the policy a name and a description and click "Create Policy".
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_policy_3_name.png)
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_policy_4_created.png)
+
+### Step 2 - Create Role {#role-arn-2}
+
+Now, still within the IAM section of the AWS Console, click "Roles" in the navigation bar and click "Create Role".
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_role_1_list.png)
+
+Retrieve your __Braze Account ID__ and __External ID__ from your Braze account.
+
+{% tabs %}
+{% tab Braze Currents %}
+
+Navigate to the "Currents" page in your Braze account under the "Integrations" section, click the "Create Current" dropdown, and select "Amazon S3 Data Export".
+
+![AWS Creds]({{ site.baseurl }}/assets/img/currents-role-arn.png)
+
+{% endtab %}
+{% tab Dashboard Data Export %}
+
+Navigate to the "Technology Partners" page in your Braze account under the "Integrations" section and click on "Amazon S3".
+
+![AWS Creds]({{ site.baseurl }}/assets/img/data-export-role-arn.png)
+
+{% endtab %}
+{% endtabs %}
+
+Back on the AWS Console, select "Another AWS Account" from the type of trusted entity selector. Enter the __Braze Account ID__, check "Require external ID", and enter the __Braze External ID__. Click "Next" when complete.
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_role_2_another.png)
+
+### Step 3 - Attach Policy {#role-arn-3}
+
+Next, attach the Policy you created earlier to the Role. Search for the policy in the search bar, and place a checkmark next to the policy to attach it. Click "Next" when complete.
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_role_3_attach.png)
+
+Give the Role a name and a description, and click "Create Role".
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_role_4_name.png)
+
+You should now see your newly created Role in the list.
+
+### Step 4 - Link to Braze AWS {#role-arn-4}
+
+Still on the AWS Console, find your newly created Role in the list. Click the name to open up the details of that Role.
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_role_5_created.png)
+
+Take note of the "Role ARN" at the top of the summary (click the icon to copy to the clipboard.)
+
+![Role ARN]({{ site.baseurl }}/assets/img/create_role_6_summary.png)
+
+Return to your Braze account and copy the Role ARN into the field provided.
+
+{% tabs %}
+{% tab Braze Currents %}
+
+Navigate to the "Currents" page in your Braze account under the "Integrations" section, click the "Create Current" dropdown, and select "Amazon S3 Data Export".
+
+![AWS Creds]({{ site.baseurl }}/assets/img/currents-role-arn.png)
+
+Give your Current a name. Then, in the Credentials section, make sure the "AWS Role ARN" radio button is selected, then input your Role ARN, and AWS S3 Bucket Name in the designated fields.
+
+You can also add the following customizations, based on your needs:
+
+-   Folder Path (defaults to `currents`)
+-   AES-256 Encryption (defaults to OFF)
+
+Click "Launch Current" to continue.
+
+A notification will inform you whether your credentials have been successfully validated. AWS S3 should now be set up for Braze Currents.
+
+{% endtab %}
+{% tab Dashboard Data Export %}
 
-#### Step 1 {#aws-1}
+Navigate to the "Technology Partners" page in your Braze account under the "Integrations" section and click on "Amazon S3".
 
-Navigate to the 'Technology Partners' page on the Braze Dashboard under the 'Integrations' section and click on 'Amazon S3'.
+![AWS Creds]({{ site.baseurl }}/assets/img/data-export-role-arn.png)
 
-![AWS Creds][5]
+On the __AWS Credentials__ page, make sure the "AWS Role ARN" radio button is selected, then input your Role ARN, and __AWS S3 Bucket Name__ in the designated fields. Click "Test Credentials" first to ensure your credentials work properly, then "Save" once this is successful.
 
-#### Step 2 {#aws-2}
+{% alert note %}
+You can always retrieve new credentials by navigating to your user and clicking "Create Access Key" on the Security Credentials Tab within the AWS Console.
+{% endalert %}
 
-On the AWS Credentials page, input your AWS Access ID, AWS Secret Access Key, and AWS S3 Bucket Name in the designated fields. When inputting your secret key, click 'Test Credentials' first to ensure your credentials work, then 'Save' once this is successful.
+A notification will inform you whether your credentials have been successfully validated. AWS S3 should now be integrated into your Braze account.
 
-> You can always retrieve new credentials by navigating to your user and clicking 'Create Access Key' on the Security Credentials Tab within the AWS Console.
+{% endtab %}
+{% endtabs %}
 
-## Integration Complete {#aws-3}
 
-AWS S3 should now be integrated into your Braze account. A notification will inform you if your credentials have been successfully validated.
 
 [3]: http://aws.amazon.com/
 [4]: http://aws.amazon.com/
diff --git a/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3_for_currents.md b/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3_for_currents.md
deleted file mode 100644
index 394aef92a8..0000000000
--- a/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3_for_currents.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-nav_title: Amazon S3 for Currents
-page_order: 1
-alias: /partners/amazon_s3_for_currents/
----
-
-# Amazon S3
-
-[Amazon S3](https://aws.amazon.com/s3/) is a highly scalable storage system offered by Amazon Web Services. After transporting data into S3, you can use ETL processes (Extract, Transform, Load) to transfer your data to other locations.
-
-If you're looking for information on the API integration with AWS S3, [click here]({{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3/).
-
-To get started, create a new S3 bucket for this integration. Then, create an IAM user in your AWS account that has the `s3:PutObject`, `s3:GetBucketLocation` and `s3:ListObject` permissions for the new S3 bucket. Gather the following information from the bucket and IAM user:
-
--   Access Key ID for user
--   Secret Access Key for user
--   Bucket Name
-
-You can also add the following customizations, based on your needs:
-
--   Folder Path (defaults to `currents`)
--   AES-256 Encryption (defaults to OFF)
-
-Add this information to the Amazon S3 Currents page on the dashboard, and press save.
-
-![S3]({% image_buster /assets/img_archive/currents-s3-edit.png %})
diff --git a/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents.md b/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents.md
index 56834d40a0..cec2aaa552 100644
--- a/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents.md
+++ b/_docs/_partners/technology_partners/data_and_infrastructure_agility/data_warehouses/google_cloud_storage_for_currents.md
@@ -6,10 +6,6 @@ alias: /partners/google_cloud_storage_for_currents/
 
 # Google Cloud Storage
 
-{% alert note %}
-Google Cloud Storage for Currents is currently rolling out slowly and availability is temporarily limited. Please contact your Account Manager if you are interested in using this feature.
-{% endalert %}
-
 [Google Cloud Storage](https://cloud.google.com/storage/) is a massively scalable object storage for unstructured data offered by Google as part of the Cloud Computing product suite. After streaming data into Google Cloud Storage Storage, you can use ETL processes (Extract, Transform, Load) to transfer your data to other locations, such as Google Bigquery.
 
 ## Integration
diff --git a/_docs/_partners/technology_partners/data_augmentation/contextual_location/factual.md b/_docs/_partners/technology_partners/data_augmentation/contextual_location/factual.md
index 3b8cd3e778..4ddaa2239a 100644
--- a/_docs/_partners/technology_partners/data_augmentation/contextual_location/factual.md
+++ b/_docs/_partners/technology_partners/data_augmentation/contextual_location/factual.md
@@ -7,7 +7,7 @@ alias: /partners/factual/
 
 [Factual](https://www.factual.com/) is a location data company powering innovation in product development, mobile marketing, and real-world analytics.
 
-Leverage Factual to better understand and uplevel mobile experiences through location data. Obtain a comprehensive picture of your customers' online interests and real-world behaviors with Factual's [Engine SDK](https://www.factual.com/products/engine/) and gain greater insight on end-user journeys and places visited. With this integration, available for both iOS and Android, developers are able to implement location intelligence and build personalized user engagement. This can by made possible by allowing Braze to receive custom events when the user is at a known factual place or when an engine circumstance with the actionId ```push-to-braze``` is met.
+Leverage Factual to better understand and uplevel mobile experiences through location data. Obtain a comprehensive picture of your customers' online interests and behaviors with Factual's [Engine SDK](https://www.factual.com/products/engine/) and gain greater insight on end-user journeys and places visited. With this integration, available for both iOS and Android, developers are able to implement location intelligence and build personalized user engagement. This can by made possible by allowing Braze to receive custom events when the user is at a known Factual place or when an engine circumstance with the actionId ```push-to-braze``` is met.
 
 # Pre-Requisites
 {% tabs %}
@@ -104,7 +104,6 @@ From there, we will need to specify an ID name for our action as shown below.
 
 Once it is completed, our updates will happen **over the air to any Engine live instance matching your ENGINE/GARAGE API key**. Copy your ENGINE/GARAGE API as a reference then click on the **Next** button and lastly the **Push Changes** button found on the next screen. Our updates will occur typically in 30 minutes, but this time can also be set programmatically to whatever is needed by your teams.
 
-
 {% alert important %}
 After setting our conditions, be sure to note the ID name you created for your action. This will be found in the Braze Dashboard later when you select it as your delivery trigger as an action-based event.
 {% endalert %}
diff --git a/_docs/_partners/technology_partners/data_augmentation/contextual_location/foursquare.md b/_docs/_partners/technology_partners/data_augmentation/contextual_location/foursquare.md
index c33995016b..46210fbe99 100644
--- a/_docs/_partners/technology_partners/data_augmentation/contextual_location/foursquare.md
+++ b/_docs/_partners/technology_partners/data_augmentation/contextual_location/foursquare.md
@@ -5,48 +5,47 @@ alias: /partners/foursquare/
 
 # Foursquare Integration
 
-To unlock even more powerful location-based campaign targeting, Braze provides a seamless product integration with location intelligence company [Foursquare](https://foursquare.com/).
+Unlock location data campaign targeting, Braze provides a seamless product integration with [Foursquare](https://foursquare.com/).
 
-You can use Foursquare’s Pilgrim SDK on iOS and Android to provide real-time event triggering based upon your users’ location in the physical world, allowing you to harness Foursquare’s powerful geo-targeting capabilities and take action with Braze.
+You can use Foursquare’s Pilgrim SDK on iOS and Android to provide real-time event triggering based on location, allowing you to harness Foursquare’s powerful geo-targeting capabilities to send relevant, personalized messaging with Braze.
 
-This partnership integration opens up a variety of powerful use-cases to help you personalize your users' experiences:
+## Integration
 
-* Send customers a notification when they arrive at or leave a particular location based upon Foursquare contextual data, such as a concert venue or Home.
-* Trigger coupons or promotions for high-value customers when they arrive at a location.
-* Gather key demographic or behavioral data over time for richer retargeting.
+Be sure that both the Braze and Foursquare Pilgrim SDKs are integrated properly.
 
-## Integration Details
+After you integrate the Pilgrim SDK, you'll begin receiving location events on the device or to a webhook.
 
-To enable this integration, first integrate the Braze and Foursquare Pilgrim SDKs on Android and iOS. To integrate the Pilgrim SDK you simply add a few lines of code to your AppDelegate on iOS or MainActivity class on Android. You’ll then instantly began receiving visit events on the device or to a webhook - even when your app isn’t running.
+To properly map between the Braze and Foursquare SDKs, set the same user ID in both systems, using the [`changeUser` method]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/analytics/setting_user_ids/#setting-user-ids) in the Braze SDK and the `setUserId` method of [`PilgrimUserInfo`](https://developer.foursquare.com/docs/pilgrim-sdk/advanced-setup-guide#custom-user-data) in the Pilgrim SDK.
 
-In order to properly map the Braze and Foursquare SDKs, you will need to set the same user ID in both systems, using the `changeUser` method in the Braze SDK and the `setUserId` method of `PilgrimUserInfo` in the Pilgrim SDK.
+Next, find your App Group and App IDs on the Developer Console section of your Braze account.
 
-Next, find your App Group and App IDs on the Developer Console section of the Braze Dashboard.
+![Braze Developer Console][1]
 
-![Braze Developer Console]({% image_buster /assets/img_archive/dev-console.png %})
+Enter your Braze REST API Key and App IDs in the Foursquare Pilgrim Console.
 
-Enter your Braze REST API Key and (optionally) App IDs in the Foursquare Pilgrim Console:
+![Pilgrim Developer Console][2]{: height="40%" width="40%"}
 
-![Pilgrim Developer Console]({% image_buster /assets/img_archive/pilgrim-dev-console.png %})
-
-Once you have configured the Pilgrim Console, the Pilgrim SDK will automatically track location events and forward them to Braze, allowing you to retarget and segment your customers. See the [Foursquare developer site](https://developer.foursquare.com/) for more details.
+Once you have configured the Pilgrim Console, the Pilgrim SDK will record location events and forward them to Braze, allowing you to retarget and segment qualified customers. See the [Foursquare developer site](https://developer.foursquare.com/) for more details.
 
 {% alert important %}
 Pilgrim SDK requires that you enable location services.
 {% endalert %}
 
-## Triggering Messages based upon Location events
+## Triggering Messages
 
-You can set up a Campaign or Canvas in the Braze Dashboard that will action off of location events generated by the Pilgrim SDK. This integration route is ideal for real-time messaging right as users enter a venue of interest, or delayed follow-on communication after they've left it (e.g. a thank you note or reminder).
+You can set up a Campaign or Canvas that will action off of location events generated by the Pilgrim SDK. This integration route is ideal for real-time messaging right as users enter a venue of interest, or delayed follow-on communication after they've left it (e.g. a thank you note or reminder).
 
-For example, you can setup an Action-Based Campaign within Braze that will send messages when a user arrives at home. Create a Campaign (or a Canvas) in Braze, and set it to send using Action-Based Delivery. For your trigger, use a Custom Event of `arrival` with an event property filter for `locationType` as shown below:
+Set up an Action-Based Campaign within Braze that will send messages based on a set location. Create a Campaign (or a Canvas) in Braze, and set it to send using Action-Based Delivery. For your trigger, use a Custom Event of `arrival` with an event property filter for `locationType` as shown below:
 
 ![Pilgrim Developer Console]({% image_buster /assets/img_archive/action-based-campaign.png %})
 
-## Retargeting users based upon their last known location
+## Retargeting
 
 You can use the Pilgrim SDK to set a `last_location` Custom Attribute on your Braze users' User Profiles. You can then use the "matches regex" comparison to retarget users who went to a particular location in the real world: for example, segmenting all users who were recently at a pizza place.
 
 ![Pilgrim Developer Console]({% image_buster /assets/img_archive/last-location-segment.png %})
 
 You can also segment users in Braze who visited a particular type of venue, based on Foursquare's `primaryCategoryId` in a particular window of time. To leverage this data point for your retargeting use cases, please log `primaryCategoryId` as an event property during your audience segmentation process. To identify the users and properties used by the Foursquare API and Pilgrim SDK, please refer to the [Foursquare developer site](https://developer.foursquare.com/).
+
+[1]: {% image_buster /assets/img_archive/dev-console.png %}
+[2]: {% image_buster /assets/img_archive/pilgrim-dev-console.png %}
diff --git a/_docs/_partners/technology_partners/data_augmentation/contextual_location/gimbal.md b/_docs/_partners/technology_partners/data_augmentation/contextual_location/gimbal.md
index 11572c3670..bdbf428cbc 100644
--- a/_docs/_partners/technology_partners/data_augmentation/contextual_location/gimbal.md
+++ b/_docs/_partners/technology_partners/data_augmentation/contextual_location/gimbal.md
@@ -5,12 +5,12 @@ alias: /partners/gimbal/
 
 # About Gimbal
 
-Originally started out of Qualcomm, Gimbal enables you to perfect your marketing relevance using physical-world location data. Their always-on location SDK paired with geofencing software and beacons power relevant, personalized, proximity-aware mobile experiences.
+Originally started out of Qualcomm, Gimbal enables you to perfect your marketing relevance using location data. Their location SDK paired with geofencing software and beacons power relevant, personalized, proximity-aware mobile experiences.
 
 Combine your beacon or geofence support with Braze’s targeting and messaging features to learn more about your user’s physical actions and message them accordingly. This partnership integration opens up an array of use cases for:
-- __Marketing:__ Send contextually relevant messaging and build experiential consumer journeys utilizing location intelligence.
-- __Competitive Analysis:__ Set up triggers around competitive locations to understand your user’s activity with competitors.
-- __Audience Insights:__ Understand how your users move about the world, track visitation behaviors, and further segment them based on location learnings.
+- __Marketing:__ Send contextually relevant messaging and build experiential consumer journeys.
+- __Competitive Analysis:__ Set up triggers around competitive locations to understand consumer trends and patterns.
+- __Audience Insights:__ Understand your users' visitation behaviors and further segment based on those learnings.
 
 # Pre-Requisites
 
diff --git a/_docs/_partners/technology_partners/data_augmentation/contextual_location/neura.md b/_docs/_partners/technology_partners/data_augmentation/contextual_location/neura.md
index c5bd07f6a3..24ec5de771 100644
--- a/_docs/_partners/technology_partners/data_augmentation/contextual_location/neura.md
+++ b/_docs/_partners/technology_partners/data_augmentation/contextual_location/neura.md
@@ -5,22 +5,18 @@ alias: /partners/neura/
 
 # Neura Integration
 
-Braze enables you to unlock the power of real-world engagement opportunities and drive effective and intelligent customer journeys. Braze provides a seamless product integration with consumer-centric intelligence company [Neura][1]. Transform Neura’s live consumer insights into action in near real-time using Braze. Transition to one-to-one engagement and maximize the value of each user.
+Braze enables you to unlock the power of real-world engagement opportunities and drive effective and intelligent customer journeys. Braze provides a seamless product integration with consumer-centric intelligence company [Neura][1]. Transform Neura’s live consumer insights into action in near real-time using Braze to create personal experiences between users and your brand.
 
--   Adapt your product based on each user’s real-world lifestyle and habits - Leverage Neura’s [True Personas™][2] when segmenting users.
--   Deliver perfectly timed consumer experiences based on real-world situations throughout each user’s day - Leverage [Neura Moments™][3] when triggering campaigns.
-
-This partnership integration opens up a variety of powerful engagement opportunities to help you personalize your users’ experiences:
-
--   Engage users who need a ride to work – Morning Commuters that just got up.
--   Engage users who need a medication reminder – Busy Bees, Workaholics that are about to go to bed.
--   Engage users who are receptive to convert to premium offerings or reactivation when idle at home or commuting to work.
+-   Leverage Neura’s [True Personas™][2] segment users based on their behavioral traits.
+-   Leverage [Neura Moments™][3] when triggering campaigns to deliver personal messaging experiences.
 
 ![neura-real-world-personas-moments.png][11]
 
 ## Integration Details
 
-To enable this integration, first integrate the Braze and Neura SDKs on Android and iOS. To integrate the Neura SDK you simply add a few lines of code to your [AppDelegate on iOS][8] or [MainActivity class on Android][4]. You’ll then instantly begin receiving [Neura Moments™][3], on the device or to a webhook, as Braze custom events - even when your app isn’t running. You’ll also gain the ability to segment users based on their real-world lifestyles and habits, [True Personas™][2], and turn those into Braze user attributes.
+To get started, ensure that the Braze and Neura SDKs are properly integrated for Android and iOS.
+
+To integrate the Neura SDK you simply add a few lines of code to your [AppDelegate on iOS][8] or [MainActivity class on Android][4]. You’ll then begin receiving [Neura Moments™][3], on the device or to a webhook, as Braze custom events. You’ll also gain the ability to segment users based on their real-world lifestyles and habits, [True Personas™][2], and turn those into Braze user attributes.
 
 ![neura-personas-moments.png][10]
 
@@ -36,33 +32,10 @@ Enter your Braze REST API Key and (optionally) App IDs in the Neura Console (for
 
 Once you have configured the Neura Console, the Neura API will automatically uncover engagement opportunities and forward them to Braze, allowing you to target and segment your customers. See the [Neura developer site][6] for more details, tutorials, and FAQs.
 
-**Note that the Neura SDK requires that you enable location services.**
-
-## Segmenting
-
-A Neura [True Personas™][2] is an ML generated user profile that represents each user's real-world behavioral traits. Unlike web-based segments, which are remotely-inferred from the user's interest in web content, a [True Personas™][2] is directly coupled to each user's lifestyle, routine, and habits.
-
-While web-based segments age from the moment they are generated, losing their value and relevancy over time, a [True Personas™][2] is dynamic, current, and built to serve today's always-on digital experiences.
-
-![neura-persona_diagram.png][14]
-
-You can use the Neura API to set each user’s [True Personas™][2] as a Custom Attribute on your Braze users’ User Profiles. You can then use the “matches regex” comparison to engage users who have a specific set of behavioral or personality traits in the real world: for example, segmenting all users who are avid runners, workaholics, business travelers, busy bees, etc.
-
-![neura-personas-in-braze.png][15]
-
-You can even dive deeper and segment users by specific real-world behavioral metrics to leverage this data point for your precise targeting use cases by accessing [Behavioral Profiles][7] during your audience segmentation process.
-
-## Messaging
-
-Be there, when each user needs you. Set up a Campaign or Canvas in the Braze Dashboard that will take action based on real-world situations in each user’s life – [Neura Moments™][3] are engagement opportunities generated by the Neura API. This integration route is ideal for reaching each user with contextually-relevant messaging when they are in need of your service or receptive to an engagement attempt by your product.
-
-![neura-moments_diagram.png][16]
-
-For example, you can setup an Action-Based Campaign within Braze that sends messages when a user wakes up, finishes a run, is predicted to go to bed, or arrives to an airport. Create a Campaign (or a Canvas) in Braze and set it to send using Action-Based Delivery. For your trigger, use a Custom Event based on a [Neura Moments™][3] as seen below:
-
-![neura-moments-in-braze.png][17]
+{% alert note %}
+The Neura SDK requires that you enable location services.
+{% endalert %}
 
-Make each engagement attempt a welcome ones. Engage the relevant True Persona™ at the ideal Neura Moment™ to achieve optimal engagement and drive higher conversion rates.
 
 [1]: https://www.theneura.com/
 [2]: https://dev.theneura.com/api-reference/persona/?ref=braze
diff --git a/_docs/_partners/technology_partners/data_augmentation/contextual_location/radar.md b/_docs/_partners/technology_partners/data_augmentation/contextual_location/radar.md
index df084866ac..9a0e92fb88 100644
--- a/_docs/_partners/technology_partners/data_augmentation/contextual_location/radar.md
+++ b/_docs/_partners/technology_partners/data_augmentation/contextual_location/radar.md
@@ -5,27 +5,27 @@ alias: /partners/radar/
 
 # Radar Integration
 
-[Radar](https://www.onradar.com/) is a location platform for mobile apps. You can use Radar to add location context and tracking to your iOS and Android apps in <10 lines of code, allowing you to easily identify or retarget users and augment your marketing with rich location data.
+[Radar](https://www.onradar.com/) is a location platform for mobile apps. You can use Radar to add location context and tracking to your iOS and Android apps in less than 10 lines of code, allowing you to easily retarget to your customers and augment your marketing with rich location data.
 
-The Radar platform has three products: Geofences, Insights, and Places.
+The Radar platform has three products: [Geofences](https://www.onradar.com/documentation/geofences), [Insights](https://www.onradar.com/documentation/insights), and [Places](https://www.onradar.com/documentation/places).
 
-* [Geofences](https://www.onradar.com/documentation/geofences): Radar geofencing supports many powerful features, including cross-platform support for unlimited geofences, polygon geofences, stop detection, and accuracy down to 30 meters. Create geofences to receive the `entered_geofence` and `exited_geofence` events.
-* [Insights](https://www.onradar.com/documentation/insights): Radar can learn a user’s approximate home and work locations and tell you when a user is at home, at work, or traveling. Turn on Insights on the Radar dashboard to receive the `entered_home`, `exited_home`, `entered_office`, `exited_office`, `started_traveling`, and `stopped_traveling` events.
-* [Places](https://www.onradar.com/documentation/places): Radar can tell you when a user visits a place, even if you haven’t set up a geofence for that location. Places have category and chain information. Radar is integrated with Facebook Places, the same place database that powers Facebook and Instagram, with over 140M places worldwide. Turn on Places to receive the `entered_place` and `exited_place` events.
-
-Whenever Radar events are generated, Radar will send custom events and user attributes to Braze. You can use events and user attributes to build location-based segments or trigger location-based campaigns.
+Whenever Radar events are generated, Radar will send __custom events__ and __user attributes__ to Braze. You can use events and user attributes to build location-based segments or trigger location-based campaigns.
 
 ## Integration Details
 In order to properly map data between the Braze and Radar SDKs, you will need to set the same user ID in both systems, using the `changeUser` method in the Braze SDK and the `setUserId` method in the Radar SDK.
 
-To enable the integration, on the Braze Developer Console page, copy your group identifier. Then, on the Braze Manage App Group page, copy your iOS API keys and Android API keys.
+To enable the integration, go to the Braze `Developer Console` page and copy your group identifier. Then, on the Braze `Manage App Group` page, copy your iOS API keys and Android API keys.
 
 Finally, on the Radar [Integrations page](https://www.onradar.com/integrations) under Braze:
 
-* Set "Enabled" to "Yes"
-* Paste in your group identifier and API keys. Note that you can set separate API keys for the Test and Live environments.
+* Set "Enabled" to "Yes".
+* Paste in your group identifier and API keys.
+
+{% alert note %}
+  You are able to set separate API keys for the Test and Live environments.
+{% endalert %}
 
-Whenever Radar events are generated, Radar will send custom events and user attributes to Braze. Events from iOS devices will be sent using your iOS API keys, and events and user attributes from Android devices will be sent using your Android API keys.
+Whenever Radar events are generated, Radar will send custom events and user attributes to Braze. Events from iOS devices will be sent using your iOS API keys; events and user attributes from Android devices will be sent using your Android API keys.
 
 ## Use Cases
 
diff --git a/_docs/_user_guide/administrative/app_settings/developer_console/internal_groups_tab.md b/_docs/_user_guide/administrative/app_settings/developer_console/internal_groups_tab.md
index 2fd8c1faaa..0f06ebdc76 100644
--- a/_docs/_user_guide/administrative/app_settings/developer_console/internal_groups_tab.md
+++ b/_docs/_user_guide/administrative/app_settings/developer_console/internal_groups_tab.md
@@ -54,7 +54,7 @@ Only Groups that are tagged as Content Test will be available on the ‘preview
 
 Seed Groups are only meant for the Email channel and allow you to send a copy of each email variant message to members of that group. Seed Groups are not available for API Campaigns, though you can include Seed Groups via an API triggered entry in Campaign. This feature is typically used with partners such as Return Path or 250OK to measure deliverability metrics. It can be used to keep a record of the email content for historical/archive purposes.
 
-Once you have created an Internal Group and tagged it to be used as a Seed Group, you can select it from the Delivery section of the Campaign composer or on the Send Settings section in a Canvas.
+Once you have created an Internal Group and tagged it to be used as a Seed Group, you can select it from the "Target Users" section of the Campaign composer or on the Send Settings section in a Canvas.
 
 _If your Seed Group members report not seeing the message in their inbox, ensure that they are listed in the Internal Group, verify that your subject lines are different and that Gmail has not bundled the emails together, or have them check their SPAM folders._
 
diff --git a/_docs/_user_guide/data_and_analytics/custom_data/custom_attributes.md b/_docs/_user_guide/data_and_analytics/custom_data/custom_attributes.md
index f468bb403c..01b1ecdb6a 100644
--- a/_docs/_user_guide/data_and_analytics/custom_data/custom_attributes.md
+++ b/_docs/_user_guide/data_and_analytics/custom_data/custom_attributes.md
@@ -24,10 +24,14 @@ String attributes are useful for storing user input, such as a favorite brand, a
 | Check if the string attribute __does not exist__ on a user's profile | __IS NOT BLANK__ | __N/A__ |
 
 {% alert tip %}
-We use [Perl compatible regular expressions (PCRE)](http://www.regextester.com/pregsyntax.html).
+For more on how to use our RegEx filter, check out this documentation on [Perl compatible regular expressions (PCRE)](http://www.regextester.com/pregsyntax.html).
+<br>
+More resources on RegEx:
+- [RegEx Tester and Debugger](https://regex101.com/)
+- [RegEx: Learn More](https://regexr.com/)
+- [RegEx Tutorial](https://medium.com/factory-mind/regex-tutorial-a-simple-cheatsheet-by-examples-649dc1c3f285)
 {% endalert %}
 
-
 ## Arrays
 Array attributes are good for storing related lists of information about your users. For example, storing the last 100 pieces of content a user watched within an array would allow specific interest segmentation.
 
@@ -40,7 +44,13 @@ Array attributes are good for storing related lists of information about your us
 | Check if the array attribute __is empty__ | __IS EMPTY__ | __N/A__ |
 
 {% alert tip %}
-We use [Perl compatible regular expressions (PCRE)](http://www.regextester.com/pregsyntax.html).
+For more on how to use our RegEx filter, check out this documentation on [Perl compatible regular expressions (PCRE)](http://www.regextester.com/pregsyntax.html).
+<br>
+
+More resources on RegEx:
+- [RegEx Tester and Debugger](https://regex101.com/)
+- [RegEx: Learn More](https://regexr.com/)
+- [RegEx Tutorial](https://medium.com/factory-mind/regex-tutorial-a-simple-cheatsheet-by-examples-649dc1c3f285)
 {% endalert %}
 
 ## Dates
@@ -58,8 +68,8 @@ Date filters using relative dates (e.g., more than 1 day ago, less than 2 days a
 | Check if the date attribute __is after__ a __selected date__| __AFTER__ | __CALENDAR DATE SELECTOR__ |
 | Check if the date attribute is __more than X number__ of __days ago__ | __MORE THAN__ | __NUMBER OF DAYS AGO__ |
 | Check if the date attribute is __less than X number__ of __days ago__| __LESS THAN__ | __NUMBER OF DAYS AGO__ |
-| Check if the date attribute is __in more than X number__ of __days in the future__ | __IN MORE THAN__ | __NUMBER OF DAYS IN FUTURE |
-| Check if the date attribute is __less than X number__ of __days in the future__ | __IN LESS THAN__ | __NUMBER OF DAYS IN FUTURE  |
+| Check if the date attribute is __in more than X number__ of __days in the future__ | __IN MORE THAN__ | __NUMBER OF DAYS IN FUTURE__ |
+| Check if the date attribute is __less than X number__ of __days in the future__ | __IN LESS THAN__ | __NUMBER OF DAYS IN FUTURE__  |
 | Check if the date attribute __exists__ on a user's profile | __EXISTS__ | __N/A__ |
 | Check if the date attribute __does not exist__ on a user's profile | __DOES NOT EXIST__ | __N/A__ |
 
diff --git a/_docs/_user_guide/data_and_analytics/export_braze_data/export_campaign_results_data.md b/_docs/_user_guide/data_and_analytics/export_braze_data/export_campaign_results_data.md
index b41c020169..6d010b7695 100644
--- a/_docs/_user_guide/data_and_analytics/export_braze_data/export_campaign_results_data.md
+++ b/_docs/_user_guide/data_and_analytics/export_braze_data/export_campaign_results_data.md
@@ -71,7 +71,7 @@ In-app message campaign results contain graphs for the following analytics:
 
 ## Campaign Recipients
 
-You can export user data for all the recipients of a campaign as a CSV file. To do so, click the User Data button on the campaign page:
+You can export user data for all the recipients of a campaign as a CSV file. To do so, click the __User Data__ button in the __Campaign Details__ block.
 
 ![Export icon][6]
 
@@ -85,6 +85,6 @@ The exported file includes the same user data fields which are included when you
 - API ID of campaign variation received
 - Whether user is in control group
 
-[6]: {% image_buster /assets/img_archive/Export_Icon.png %}
-[26]: {{ site.baseurl }}/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/aws_s3/#aws-s3-integration
+[6]: {% image_buster /assets/img/campaign_export_example.png %}
+[26]: {{ site.baseurl }}//partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3/#amazon-s3-integration
 [40]: {{ site.baseurl }}/user_guide/data_and_analytics/export_braze_data/exporting_app_usage_data/#exporting-app-usage-data
diff --git a/_docs/_user_guide/data_and_analytics/user_data_collection/data_collected_by_default.md b/_docs/_user_guide/data_and_analytics/user_data_collection/data_collected_by_default.md
index 1459dfb533..d1985ecfeb 100644
--- a/_docs/_user_guide/data_and_analytics/user_data_collection/data_collected_by_default.md
+++ b/_docs/_user_guide/data_and_analytics/user_data_collection/data_collected_by_default.md
@@ -21,9 +21,9 @@ The following events and attributes are captured and updated automatically by th
 - Last Received Push Campaign (Date)
 - Last Viewed News Feed (Date)
 - Clicked Card (Integer)
-- Received Campaign
+- Received Message from Campaign
   - This filter allows you to target users based on their having (not) received a previous campaign.
-- Received Campaign with Tag
+- Received Message from Campaign with Tag
   - This filter allows you to target users based on their having (not) received a campaign that currently has a tag.
 - Retarget Campaign
   - This filter allows you to target users based on whether or not they have opened, or clicked on a specific email, push, or slide up in the past
diff --git a/_docs/_user_guide/data_and_analytics/user_data_collection/user_import.md b/_docs/_user_guide/data_and_analytics/user_data_collection/user_import.md
index 7d2626e887..5cff0e1d2f 100644
--- a/_docs/_user_guide/data_and_analytics/user_data_collection/user_import.md
+++ b/_docs/_user_guide/data_and_analytics/user_data_collection/user_import.md
@@ -7,13 +7,13 @@ page_order: 13
 Braze's User Import feature allows users to upload and update user profiles via CSV files. This feature supports updating default and custom user profile attributes.
 
 ## Formatting
-Braze accepts user data in the standard CSV format from files up to 100MB in size. The particulars of how to construct your file are described below.
+Braze accepts user data in the standard CSV format from files up to 100MB in size. The particulars of how to construct your file are described below. Or, you can [download our User Import template <i class="far fa-arrow-alt-circle-down"></i>][template]. Just download the `.xlsx` file, fill in the information, then convert it to a `.csv` and import it to Braze as instructed [below](#importing).
 
 ### Column Headers
 
 Braze expects that the first row in your CSV file will contain the headers for each column in the file. The number of columns in each row must match the number of headers.
 
-Users imported to Braze via CSV *must* be identified -- Braze does not support creating entirely anonymous users via User Import. You must specify either a 'braze_id' or an 'external_id', but not both, allowing Braze to match an existing user.
+Users imported to Braze via CSV *must* be identified -- Braze does not support creating entirely anonymous users via User Import. You must specify either a `braze_id` or an `external_id`, but not both, allowing Braze to match an existing user.
 
 * If you provide an `external_id`, we will update any existing user with the same `external_id` or create a new identified user with that `external_id` set if one is not found.
 
@@ -99,11 +99,17 @@ The filter used to create the segment selects users who were created or updated
 
 ![Edit the Segment][9]
 
+## External IDs
+
+__Do not__ use email addresses or incrementing count for your External IDs, as these can pose security risks.
+
+Instead, you should opt for a [Universally Unique Identifier (UUID)](https://en.wikipedia.org/wiki/Universally_unique_identifier) to prevent these risks and the chance of you requesting a costly and inefficient an external ID migration down the line.
+
 ## Common Errors
 
-  - No external_id: To connect data from User Import to user profiles, Braze requires an external_id in each row. Rows without a value in the external_id column will be excluded from the import. User profiles that lack an external_id cannot be created or updated via the User Import.
+  - No `external_id`: To connect data from User Import to user profiles, Braze requires an `external_id` in each row. Rows without a value in the `external_id` column will be excluded from the import. User profiles that lack an `external_id` cannot be created or updated via the User Import.
   - Malformed Row: There must be a header row in order to properly import data. Each row must have the same number of cells as the header row. Rows whose length that have more or fewer values than the header row will be excluded from the import. Commas in a value will be interpreted as a separator and can lead to this error being thrown. Additionally, all data must be [UTF-8][utf8] encoded.
-  - Multiple Data Types: Braze expects each value in a column to be of the same data type. Values which do not match their atttribute's data type will cause errors in segmenting.
+  - Multiple Data Types: Braze expects each value in a column to be of the same data type. Values which do not match their attribute's data type will cause errors in segmenting.
     - Incorrectly Formatted Dates: Dates not in the [ISO 8601][date] format will not be read as datetimes on import.
     - String Quotation: Values encapsulated in single ('') or double ("") quotation marks will be read as strings on import.
 
@@ -124,3 +130,4 @@ The filter used to create the segment selects users who were created or updated
 [utf8]: https://en.wikipedia.org/wiki/UTF-8
 [CAO]: {{ site.baseurl }}/user_guide/data_and_analytics/custom_data/custom_attributes/
 [filtering]: {{ site.baseurl }}/user_guide/engagement_tools/segments/creating_a_segment/#creating-a-segment
+[template]: {% image_buster /assets/download_file/braze-user-import-template-csv.xlsx %}
diff --git a/_docs/_user_guide/data_and_analytics/user_data_collection/user_profile_lifecycle.md b/_docs/_user_guide/data_and_analytics/user_data_collection/user_profile_lifecycle.md
index 2c74e4742d..bb8a658bc6 100644
--- a/_docs/_user_guide/data_and_analytics/user_data_collection/user_profile_lifecycle.md
+++ b/_docs/_user_guide/data_and_analytics/user_data_collection/user_profile_lifecycle.md
@@ -9,8 +9,8 @@ All persistent data associated to a user will be stored against a user profile.
 
 Once a user profile is created, either following a user being recognized by the SDK or created via API, there are a number of identifiers that can be assigned to a profile in order to identify or reference that user. These are the:
 
-* braze_id
-* external_ id; and
+* `braze_id`
+* `external_ id`; and
 * any number of aliases that you choose to set for your user base.
 
 ## Anonymous User Profiles
@@ -57,13 +57,13 @@ For information on how to set a user alias please see our [documentation][25] fo
 
 ![User_Profile_Lifecycle][26]
 
-## Advanced Use Case information
+## Advanced Use Case Information
 
 For existing identified user profiles you are able to set a new user alias via the SDK and [the API][27]. User aliases cannot be set via the API on an unknown user profile.  For more information on how to reference a user via the API please refer to our documentation.
 
-If you attempt to set a pre-existing`external_id`on a anonymous user profile which share a matching alias name but with different labels, only the alias label on the pre-existing known user profile will be maintained.
+If you attempt to set a pre-existing `external_id` on a anonymous user profile which share a matching alias name but with different labels, only the alias label on the pre-existing known user profile will be maintained.
 
-## How to troubleshoot with Braze's IDs
+## How to Troubleshoot with Braze's IDs
 
 Aside from acting as a mechanism to organize user data and reference user profiles, all `braze_id`'s can be used to find and identify users within your dashboard for testing. In order to find your user in the Braze dashboard please see our [Adding Test Users][28] section.
 
diff --git a/_docs/_user_guide/data_and_analytics/your_reports/viewing_and_understanding_segment_data.md b/_docs/_user_guide/data_and_analytics/your_reports/viewing_and_understanding_segment_data.md
index f467313de6..d8f6e77d57 100644
--- a/_docs/_user_guide/data_and_analytics/your_reports/viewing_and_understanding_segment_data.md
+++ b/_docs/_user_guide/data_and_analytics/your_reports/viewing_and_understanding_segment_data.md
@@ -71,7 +71,7 @@ On this page, you can view a number of user-specific attributes as shown below:
 [7]: {% image_buster /assets/img_archive/Preview_Users.png %}
 [8]: {% image_buster /assets/img_archive/User_Preview.png %}
 [11]: #segment-statistics
-[13]: {{ site.baseurl }}/user_guide/data_and_analytics/exporting_dashboard_data/#app-usage-data
+[13]: {{ site.baseurl }}/user_guide/data_and_analytics/export_braze_data/exporting_app_usage_data/#exporting-app-usage-data
 [14]: {{ site.baseurl }}/user_guide/data_and_analytics/export_braze_data/exporting_revenue_data/
 [16]: {% image_buster /assets/img_archive/A_Tracking_2.png %}
 [17]: {% image_buster /assets/img_archive/Revenue.png %}
diff --git a/_docs/_user_guide/engagement_tools/campaigns/ideas_and_strategies/retargeting_campaigns.md b/_docs/_user_guide/engagement_tools/campaigns/ideas_and_strategies/retargeting_campaigns.md
index 433d02a2cb..758362a3a5 100644
--- a/_docs/_user_guide/engagement_tools/campaigns/ideas_and_strategies/retargeting_campaigns.md
+++ b/_docs/_user_guide/engagement_tools/campaigns/ideas_and_strategies/retargeting_campaigns.md
@@ -12,7 +12,7 @@ Braze provides support for retargeting users based on messages they have receive
 
 Each of these retargeting filters provides you with several options after you add them.
 
-For more on targeting users, check out our [Campaign Set Up LAB course](http://lab.braze.com/campaign-setup-delivery-targeting-conversions)! 
+For more on targeting users, check out our [Campaign Set Up LAB course](http://lab.braze.com/campaign-setup-delivery-targeting-conversions)!
 
 ## Retargeting Filters
 
@@ -76,25 +76,25 @@ Use this filter to find users who Are/Are Not in the control group of your targe
 
 Use this filter to find users who Are/Are Not in the control group of your target Canvas, which can be selected in the drop-down.
 
-### Last Received Specific Campaign Filter
+### Last Received Message from Specific Campaign Filter
 
 ![lastreceivedspecificcamp][14]
 
 Use this filter to find users who last received a specific Campaign before or after a specified date or number of days.
 
-### Last Received Specific Campaign or Canvas with Tag Filter
+### Last Received Message from Specific Campaign or Canvas with Tag Filter
 
 ![lastreceivedcampwithtag][17]
 
 Use this filter to find users who last received a specific Campaign or Canvas with a given tag before or after a specified date or number of days.
 
-### Received Campaign Filter
+### Received Message from Campaign Filter
 
 ![receivedcamp][4]
 
 \" this filter to find users who Have/Have Not received your target Campaign, which you select in the drop-down.
 
-### Received Campaign or Canvas with Tag Filter
+### Received Message from Campaign or Canvas with Tag Filter
 
 ![receivedcampwithtag][15]
 
diff --git a/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/archiving_campaigns.md b/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/archiving_campaigns.md
index 6e3d8bb3ca..fd42850eab 100644
--- a/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/archiving_campaigns.md
+++ b/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/archiving_campaigns.md
@@ -34,6 +34,10 @@ Unarchiving a campaign does not make it live. This action will simply move your
 
 ![Resume Campaign][5]
 
+{% alert warning %}
+When you archive a Segment, any Campaigns using it will __also be archived__.
+{% endalert %}
+
 [1]: {% image_buster /assets/img_archive/Archiving.png %}
 [2]: {% image_buster /assets/img_archive/Include_archived.png %}
 [3]: {% image_buster /assets/img_archive/Archive_pause_selected.png %}
diff --git a/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/intelligent_delivery.md b/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/intelligent_delivery.md
index bcc79f7f97..8c963ae80a 100644
--- a/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/intelligent_delivery.md
+++ b/_docs/_user_guide/engagement_tools/campaigns/scheduling_and_organizing/intelligent_delivery.md
@@ -20,4 +20,4 @@ If you're using Intelligent Delivery, Braze recommends that your campaign's segm
 
 It is also important to be aware of the limitations of using Intelligent Delivery within the first week of a user's lifecycle. A new user will have limited data for Intelligent Delivery to use in determining the optimal time to send a message. It can, however, still be valuable.  Consider a user that has recorded only one session. The time in which that user recorded their session could very well be the best time to attempt to engage them. Intelligent Delivery would only use data from the user's first session, and as such would engage the user at that time.  In general, Intelligent Delivery can more effectively calculate the optimal send time later in a user's lifecycle.
 
-[1]: {% image_buster /assets/img_archive/optimal_send_time.png %}
+[1]: {% image_buster /assets/img/optimal-send-time.png %}
diff --git a/_docs/_user_guide/engagement_tools/canvas/get_started/the_basics.md b/_docs/_user_guide/engagement_tools/canvas/get_started/the_basics.md
index a1975951b7..134c1be5ff 100644
--- a/_docs/_user_guide/engagement_tools/canvas/get_started/the_basics.md
+++ b/_docs/_user_guide/engagement_tools/canvas/get_started/the_basics.md
@@ -132,7 +132,7 @@ Selecting at least one conversion event will give you the ability to understand
 
 ### Build the Experience: The “How” and “Where”
 
-1. __Setting up variants:__ A variant is the trail each customer follows on their journey. Canvas supports up to four variants with a control group. While not required, you can name each variant, as well as control the distribution of the target audience following each variant.
+1. __Setting up variants:__ A variant is the trail each customer follows on their journey. Canvas supports up to eight variants with a control group. While not required, you can name each variant, as well as control the distribution of the target audience following each variant.
 
 2. __Building steps:__ A step is a marketing decision point—what is the experience you’re creating? Within a step you can set triggers or schedule delivery, refine targeting by adding filters or marking exception events, and add channels from email to push to webhooks.
 
diff --git a/_docs/_user_guide/engagement_tools/segments/creating_a_segment.md b/_docs/_user_guide/engagement_tools/segments/creating_a_segment.md
index 4361088f45..3fe8492206 100644
--- a/_docs/_user_guide/engagement_tools/segments/creating_a_segment.md
+++ b/_docs/_user_guide/engagement_tools/segments/creating_a_segment.md
@@ -28,7 +28,7 @@ Choose which apps or platforms you'd like to target by either selecting "Include
 
 ![Segment App Selection][5]
 
-## Step 4: Add Filters to your Segment
+## Step 4: Add Filters to Your Segment
 
 Add at least one filter to your segment as depicted in the image below. You can combine as many filters as you want in order to make your segmentation more specific.
 
@@ -38,12 +38,22 @@ Choosing "OR" for your filters means that your segment will contain users satisf
 
 Notice that the statistics on your segment are changing in real time as you add and subtract filters. Keep in mind that these statistics are estimates (+/- 1%) and that the exact segment membership is always calculated before a segment is affected by a message sent in a campaign or Canvas.
 
-## Step 5: Save your Segment
+## Step 5: Save Your Segment
 
 ![Segment4][4]
 
 Once you've clicked "Save" you're ready to start sending messages to your users!
 
+## Archiving Segments
+
+If you no longer need or wish to retire a specific segment, you can archive it by going to the __Segments__ page, clicking on the appropriate gear, then selecting "Archive" from the drop down that appears.
+
+{% alert warning %}
+When you archive a segment, any Campaigns or Canvases (even if the segment is only used in a single Canvas step) using it will __also be archived__. You will get a warning listing which Campaigns and Canvases are about to be archived by archiving the associated segment.
+{% endalert %}
+
+You can unarchive the segment by navigating to it within Segments, then selecting Unarchive from the top right corner of it's page.
+
 [1]: {% image_buster /assets/img_archive/Segment1.png %}
 [2]: {% image_buster /assets/img_archive/Segment2.png %}
 [3]: {% image_buster /assets/img_archive/segment_step4.png %}
diff --git a/_docs/_user_guide/engagement_tools/segments/segmentation_filters.md b/_docs/_user_guide/engagement_tools/segments/segmentation_filters.md
index 9c53417fdc..78cf2918bc 100644
--- a/_docs/_user_guide/engagement_tools/segments/segmentation_filters.md
+++ b/_docs/_user_guide/engagement_tools/segments/segmentation_filters.md
@@ -60,20 +60,20 @@ Retargeting filters allow you to segment your users whom you have already attemp
 |Clicked/Opened Campaign|Segments your users by whether or not they have interacted with a specific campaign.|
 |Clicked/Opened Campaign or Canvas With Tag|Segments your users by whether or not they have interacted with a specific campaign or Canvas with a specific tag.|
 |Clicked/Opened Step| Segments your users by whether or not they have interacted with a specific Canvas step.|
-|Converted From Campaign|Segments your users by whether or not they have converted on a specific campaign.
-|Converted From Canvas|Segments your users by whether or not they have converted on a specific Canvas.
+|Converted from Campaign|Segments your users by whether or not they have converted on a specific campaign.
+|Converted from Canvas|Segments your users by whether or not they have converted on a specific Canvas.
 |Entered Canvas Variation|Segments your users by whether or not they have entered a variation path of a specific Canvas.
-|Has Never Received A Campaign or Canvas Step| Segments your users by whether or not they have received a designated campaign or canvas step.|
+|Has Never Received a Message from a Campaign or Canvas Step| Segments your users by whether or not they have received a designated campaign or canvas step.|
 |In Campaign Control Group|Segments your users by whether or not they were in the control group for a specific multivariate campaign.
 |In Canvas Control Group|Segments your users by whether or not they were in the control group for a specific Canvas.
 |Is Not In Segment| Segments your users by whether or not they are included in an already existing segment.|
-|Last Received Campaign or Canvas With Tag|Segments your users by when they received a specific campaign or Canvas with a specific tag.
-|Last Received Specific Campaign|Segments your users by when they last received a specific campaign.
-|Last Received Specific Canvas Step|Segments your users by selecting those who received a specific, designated Canvas Step.|
-|Received Campaign|Segments your users by whether or not they have received a specific campaign.
+|Last Received Message from Campaign or Canvas With Tag|Segments your users by when they received a specific campaign or Canvas with a specific tag.
+|Last Received Message from Specific Campaign|Segments your users by when they last received a specific campaign.
+|Last Received Message from Specific Canvas Step|Segments your users by selecting those who received a specific, designated Canvas Step.|
+|Received Message from Campaign|Segments your users by whether or not they have received a specific campaign.
 |Received Campaign Variant|Segments your users by which variant of a multivariate campaign they have received.
-|Received Campaign or Canvas with Tag|Segments your users by whether or not they have received a specific campaign or Canvas with a specific tag.
-|Received Canvas Step|Segments your users by whether or not they have received a specific Canvas step.|
+|Received Message from Campaign or Canvas with Tag|Segments your users by whether or not they have received a specific campaign or Canvas with a specific tag.
+|Received Message from Canvas Step|Segments your users by whether or not they have received a specific Canvas step.|
 
 ## Marketing Activity
 Marketing filters segment your users based on their previous interactions with your campaigns. These filters are effective for reaching out to large numbers of your users without spamming them.
@@ -107,7 +107,7 @@ User attribute filters segment your users by their constant attributes and chara
 |Device Count|Segments your users by how many devices they have used your app on.
 |Device Model|Segments your users by their mobile phone's model version.
 |Device OS|Segments your users by their mobile phone's operating system.
-|Email Available|Segments your users by whether or not they have reported their respective email addresses.
+|Email Available|Segments your users by whether or not they have reported their respective email addresses, and if they are subscribed/opted-in to email.
 |Email Opt In Date|Segments your users by the date on which they opted into email.
 |Email Subscription Status|Segments your users by their subscription status for email.
 |Email Unsubscribed Date|Segments your users by the date on which they unsubscribed from future emails.
diff --git a/_docs/_user_guide/engagement_tools/templates_and_media/content_blocks.md b/_docs/_user_guide/engagement_tools/templates_and_media/content_blocks.md
index cb3138c284..5dc663feda 100644
--- a/_docs/_user_guide/engagement_tools/templates_and_media/content_blocks.md
+++ b/_docs/_user_guide/engagement_tools/templates_and_media/content_blocks.md
@@ -22,8 +22,6 @@ Then, create your Content Block!
 
 ![create-content-blocks][1]
 
-- You can save a content block without content in it.
-
 Content Blocks currently have two types: `HTML` or `text`. Braze will select the type for you based on the content you inserted into the block. If Braze detects `HTML` markup in the Content Block, the block type will switch to `HTML` automatically. Otherwise, it will be considered `text`.  
 
 {% comment %}
@@ -42,7 +40,7 @@ If you choose to update a Content Block, it will update in all messages the Cont
 
 If you want to update a Content Block for a single message or make a copy of a Content Block to use in other messages, you can either copy the HTML from the original message to your new one, or edit the original Content Block (it must have been used in a message already) and save it. You will then get a prompt that allows you to save it as a new Content Block.
 
-![copy-content-block][2]
+![copy-content-block][2]{: height="70%" width="70%"}
 
 ## Nesting Content Blocks
 
@@ -54,11 +52,31 @@ Nothing will prevent you from nesting a third level of Content Block, but you wi
 
 Additionally, Content Blocks cannot be used within an email footer, though email footers can be used within Content Blocks.
 
+## Archiving Content Blocks
+
+Once you have finished using a Content Block, you can archive it from the __Templates & Media__ page.
+
+![Archive_CB][3]{: height="80%" width="80%"}
+
+Messages using the archived Block will still perform as though it was there, though we do recommend several best practices to ensure that outdated information is not included accidentally in your emails.
+
+1. When your Block is only used in a few emails, we recommend archiving the outdated Block and updating your live messages with a newer Block that has not been archived.
+2. When your Block only has a typo or needs a minor change, we do not recommend archiving the Block. Just update and get sending!
+3. When your Block is used in more messages than you can reasonably manage with the first suggestion in this list, we recommend removing __all__ content from the Block, then archiving it. This will ensure no outdated information makes its way into any newly sent emails.
+
+{% alert tip %}
+  You can save a content block without content in it.
+{% endalert %}
+
+If you made a mistake in archiving a Content Block, you can unarchive it.  
+
+![Unarchive_CB][4]
+
 ## Content Block Specifications
 
 | Content Block Attribute | Specifications |
 |---|---|
-| Name | Required field limited to 100 characters. Cannot be renamed after Content Block has been saved. Additionally, you cannot name a new Content Block the same name as a previous Content Block, even if the previous one has been deleted. |
+| Name | Required field limited to 100 characters. Cannot be renamed after Content Block has been saved. Additionally, you cannot name a new Content Block the same name as a previous Content Block, even if the previous one has been archived. |
 | Description | Optional field limited to 250 characters. Describe the Content Block so that others viewing it in the Braze product will know what it's for and where it's being used. |
 | Content Size | Limited to 50kb. |
 | Placement | Content Blocks cannot be used within an email footer. |
@@ -66,3 +84,5 @@ Additionally, Content Blocks cannot be used within an email footer, though email
 
 [1]: {% image_buster /assets/img/create-content-blocks.gif %}
 [2]: {% image_buster /assets/img/copy-content-block.png %}
+[3]: {% image_buster /assets/img/archive-content-block.png %}
+[4]: {% image_buster /assets/img/unarchive-content-block.png %}
diff --git a/_docs/_user_guide/message_building_by_channel/email/creating_an_email_campaign.md b/_docs/_user_guide/message_building_by_channel/email/creating_an_email_campaign.md
index 2f0b0f2d62..37d8017c0c 100644
--- a/_docs/_user_guide/message_building_by_channel/email/creating_an_email_campaign.md
+++ b/_docs/_user_guide/message_building_by_channel/email/creating_an_email_campaign.md
@@ -100,7 +100,7 @@ Next, you need to choose the target segment from the dropdown menu. You'll autom
 
 ![Target Segment][5]
 
-Optionally, you can also choose to limit delivery to a specified number of users within the segment, or allow users to recieve the same message twice upon a recurrence of the campaign as well.
+Optionally, you can also choose to limit delivery to a specified number of users within the segment, or allow users to receive the same message twice upon a recurrence of the campaign as well.
 
 ## Step 6: Review and Deploy
 
@@ -116,6 +116,10 @@ Braze will show you the number of emails sent, opened, clicked through, sent to
 
 When looking at clicks for your variant, the clicks will reflect unique clicks. When you expand each variation, the clicks for each link within the variation will reflect total clicks (not unique). Braze also gives you the ability to visualize where users are clicking within a given email campaign.
 
+{% alert note %}
+Braze will de-duplicate sends by email address. However, opens are not de-duplicated to prevent the illusion that an email opened by a user with multiple [User Profiles]({{ site.baseurl }}/user_guide/data_and_analytics/user_data_collection/user_profile_lifecycle/) under a single email address would only be counted towards a single User Profile.
+{% endalert %}
+
 [1]: {% image_buster /assets/img_archive/newcampaign_new.png %}
 [3]: {% image_buster /assets/img_archive/choose_email_creation.png %}
 [5]: {% image_buster /assets/img_archive/targetsegment_email_new.png %}
diff --git a/_docs/_user_guide/message_building_by_channel/email/managing_user_subscriptions.md b/_docs/_user_guide/message_building_by_channel/email/managing_user_subscriptions.md
index 044c14c2df..0f318352a1 100644
--- a/_docs/_user_guide/message_building_by_channel/email/managing_user_subscriptions.md
+++ b/_docs/_user_guide/message_building_by_channel/email/managing_user_subscriptions.md
@@ -28,7 +28,7 @@ Braze does not count subscription state changes against your data points, global
 
 _Subscription Groups_ are segment filters that can further narrow your audience from the [Global Subscription States](#subscription-states) above. These Groups offer the ability to present more granular subscription options to end users.
 
-For example, if you send out multiple categories of email campaigns, you can offer your customers the option to subscribe or unsubscribe from those lists in bulk from a single page, using our [Email Preference Center](#email-preference-center).
+For example, if you send out multiple categories of email campaigns, you can offer your customers the option to subscribe or unsubscribe from those groups in bulk from a single page, using our [Email Preference Center](#email-preference-center).
 
 Use the [Subscription Group REST APIs][25] to programmatically manage the subscription groups that you have stored on the Braze dashboard to the Subscription Group page.
 
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/create.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/create.md
new file mode 100644
index 0000000000..d0b5ad2189
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/create.md
@@ -0,0 +1,245 @@
+---
+nav_title: Create an In-App Message
+platform: Message_Building_and_Personalization
+subplatform: In-App Messages
+page_order: 1
+---
+
+# Creating an In-App Message
+
+You can create an in-app message using the Braze platform using Campaigns, Canvas, or as an API campaign. We highly recommend planning out your messages and preparing all materials ahead of time using our handy [In-App Message Prep Guide]({{ site.baseurl }}/help/best_practices/in-app_messages/prep_guide/).
+
+
+## Choose Where to Build Your Message {#create-new-campaign-in-app}
+
+{% tabs local %}
+  {% tab Campaigns %}
+  Click __Create Campaign__ to open a new messaging wizard for in-app message campaigns. Then, follow the flow of the messaging wizard to quickly create and launch your in-app message campaign.
+
+![createyouriam]({% image_buster /assets/img/create_iam.gif %}){: height="70%" width="70%"}
+
+
+1. Name your Campaign something clear and meaningful.
+2. Add __Teams__ and __Tags__, as necessary.
+3. Add and name as many Variants as you need for this campaign.
+  - You can choose different platforms, message types, and layouts for each of your added Variants.
+
+  {% alert tip %}
+If all of the messages in your campaign are going to be similar or have the same content, compose your message before adding additional Variants - you will be able to choose **Copy from Variant** from the **Add Variant** dropdown.
+{% endalert %}
+
+ {% endtab %}
+ {% tab Canvas %}
+ After you have [created and set up your Canvas using the Canvas wizard]({{ site.baseurl }}/user_guide/engagement_tools/canvas/create_a_canvas/create_a_canvas/),
+
+1. Name your step something clear and meaningful.
+2. Add a Delay, as necessary.
+3. Filter your Audience, as necessary.
+4. Choose your advancement options, as necessary.
+5. Choose all other messaging channels which you would like to pair with your message.
+
+{% alert important %}
+You cannot have multiple in-app message variants in a single step.
+{% endalert %}
+
+{% endtab %}
+{% endtabs %}
+
+
+## Step 1: Specify Your Message Types
+
+Choose a __Platform__, __Message Type__, __Layout__, and __Enforced Device Orientation__ as necessary.
+
+### Message Types
+
+Click on your desired Platform tab to learn more about the Message Types, Layouts, and other options associated with it. Learn more about the expected behavior and look of each of these messages on our [Creative Details page]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creative_details/), or by clicking on the linked message types in the tables.
+
+{% tabs local %}
+{% tab In-App Message Options %}
+
+These in-app messages are accepted by both mobile apps and web applications.
+
+#### Message Options
+
+| Message Type | Type Description | Available Layouts| Other Options |
+|---|---|---|
+|[Full-Screen]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creative_details/#full-screen)| Messages that cover the entire screen with a message block. | __Image & Text__ and __Image Only__ | Enforced Device Orientation (Portrait or Landscape)|
+|[Modal]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creative_details/#modal)|  Messages that cover the entire screen with a screen overlay and a message block. | __Text (with Optional Image)__ and __Image Only__ | None |
+|[Slideup]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creative_details/#slideup)|  Messages that slide into view in a designated place without blocking the rest of the screen. | None | None |
+
+{% endtab %}
+{% tab Advanced %}
+
+These in-app messages are customizable to your needs.
+
+#### Message Options
+
+| Message Type | Type Description |Available Layouts| Other Options |
+|---|---|---|
+|[Custom Web Message]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/#custom-web-messages)| Custom messages that perform as defined in your custom code (HTML, CSS, and/or Javascript).  |None | None |
+|[Email Capture Form]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/#email-capture-form) | Typically used to capture the viewer's email.  | None | None |
+|[Web Modal with CSS]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/#web-modal-css) | Modal messages for web with customizable CSS. | __Text (with Optional Image)__ and __Image Only__ | None |
+
+{% alert important %}
+If Braze detects that you don't have a close or dismissal button included in your code, we will request that you add one in. For your convenience, we have provided a snippet that you can copy and pasted into your code: `<a href="appboy://close">X</a>`.
+{% endalert %}
+
+{% endtab %}
+{% endtabs %}
+
+
+## Step 2: Compose In-App Message
+
+The Compose tab allows you to edit all aspects of your message’s content and behavior.
+
+![composeyouriam][24]
+
+
+The content of the Compose tab vary based on your chosen Message Options in the last step, but may include any of the options below:
+
+| Content | Options| Description |
+|---|---|---|
+|Language | See our [full list of available languages][18]. | Click __Add Languages__ and select your desired languages from the provided list. This will insert liquid into your message. We recommend selecting your languages before writing your content so you can fill in your text where it belongs in the liquid. |
+|Image | __Upload Image__, __Pick a Badge__, or use __Font Awesome__. | Where applicable, click __Include Image__ or __Upload Image__ and follow the presented instructions. Each message type and platform may have it's own suggested proportions and requirements - be sure to check what those are before commissioning or making an image from scratch! |
+|Button Text & On Click Behavior| Add up to two buttons. | You can create and edit custom button text and color. You can also add  Terms of Service Link within Web Email Capture forms.  |
+|Device Options | Restrict send to only iOS devices. | Click __Change__ and check the box as desired. |
+|Message Close Options | __Dismiss Automatically__ or __Wait for User Swipe or Touch__. | __Dismiss Automatically__ allows you to select how many seconds the message will remain on the scree. __Wait for User Swipe or Touch__ will require a dismissal or close option.  |
+|Header & Body Text | Completely custom copy (often with custom HTML capabilities) with the options to include liquid and other types of personalization. | Some message types do not need and therefore do not ask for headers. |
+|Position | __From Bottom of App Screen__ or __From Top of App Screen__. | This only exists in the Universal Slideup message builder.|
+|HTML & Assets | Completely custom via upload, URL, or copy and paste. | Copy and paste HTML into the available space and upload your assets via ZIP. |
+|Email Capture Input Placeholder | Custom copy. | This is used solely in the Web Email Capture Form and will direct your users to input the desired content into the space. |
+
+### Buttons
+
+When available for your message type, you can have up to two buttons appear below your body of text. By default, the button on the right (Button 2) is formatted to be more visually drawing to your user. We recommend using this button for singular or primary actions.
+
+![Primary_Secondary][2]{: height="40%" width="40%"}
+
+If you choose to only use one button, it will automatically adjust to take over the available space at the bottom of your message, instead of leaving room for an additional button.
+
+{% alert tip %}
+  If you decide to format these buttons with your own colors, we recommend that you use Button 2 for your more preferred result. In other words, if you want your user to click on one button more than the other, make sure it is on the right. The right button has often displayed better potential to get clicked, especially if it has a somewhat contrasting or otherwise stand-out color from the rest of the message. This is only emphasized when the button on the left blends more visually with the message.
+{% endalert %}
+
+### Generations
+
+Braze has three Generations of in-app messages available. You can fine-tune to which devices your messages should be sent, based on which Generation they support, in the [Preview]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/testing/) section which composing your in-app message.
+
+![In-App_Messages_Generations][22]{: height="50%" width="50%"}
+
+## Step 3: Style Your In-App Message
+
+The Style tab allows you to adjust all visual aspects of your message. Upload an image or badge, or pick a pre-designed badge icon. Change the colors of the header and body text, buttons and background by selecting from a palette or entering a hex, RGB or HSB code.
+
+The content of the Style tab vary based on your chosen Message Options in the last step, but may include any of the options below:
+
+| Formatting | Input | Description |
+|---|---|---|
+|Color Profile | Apply from In-App Message Templates Gallery. | Click __Apply Template__ and select from gallery. Then, click __Save__. |
+|Text Alignment | Left, Center, or Right.  | Only available for newer Braze SDK versions. |
+|Header | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color.  |
+|Text | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. |
+|Buttons | HEX color code. | Your desired HEX colors will display. You will also be able to choose the opacity of the colors. You can choose colors for: the message's Close Button Background as well as each button's Background, Text, and Border. |
+| Button Border | HEX color code. | New! This will allow you to set your primary and secondary buttons apart from one another. We suggest outlining buttons with contrasting colors. |
+|Background Color | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. This is the background of the entire message and will clearly display behind your text body. |
+|Screen Overlay | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. Only available for newer Braze SDK versions. This is the frame around the entire message. |
+|Chevron or other Close Message Option | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. |
+
+Always [preview and test]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/testing/) your message before sending.
+
+{% alert important %}
+Some in-app message types do not have the option for styling beyond uploading custom HTML (and/or CSS and/or Javascript) and assets via ZIP, as described in the steps above. [Web Modal with CSS]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/#web-modal-css) allows you to upload or write custom CSS to create beautiful, all around custom-styled messaging.
+{% endalert %}
+
+## Step 4: Configure Additional Settings
+
+Add [key-value pairs][19] to your message if needed.
+
+## Step 5: Build the Remainder of Your Campaign or Canvas
+
+Build the remainder of your campaign or Canvas, see the sections below for further details on how to best utilize our tools to build in-app messages.
+
+{% details Triggering %}
+![Schedule]({% image_buster /assets/img_archive/in-app-schedule.png %}){: height="50%" width="50%"}
+
+In-app message delivery is entirely based off of of the following action triggers:
+
+- Making a purchase
+- Opening the app/webpage
+- Performing a custom event (only works with events sent via the SDK)
+- Opening a specific push message
+- Automatically schedule campaigns to send at a certain time with respect to the local time of each of your users.
+- Messages can also be configured to recur on a daily, weekly (optionally on specific days), or monthly basis.
+
+A start date and time must be selected, however, an end date is optional. An end date will stop that specific in-app message from showing up on devices after the specified date/time.
+
+Please refer to our developer documentation for [server-side event triggering]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#in-app-message-delivery) and [local in-app message delivery]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#local-in-app-messages).
+
+{% enddetails %}
+
+{% details Prioritize %}
+
+__Campaigns__
+Finally, once you've selected the action the in-app message will be triggered off of, you should also set a priority. If two messages are triggered off of the same action, high priority messages will be scheduled to appear on users' devices before messages with lower priorities.
+
+![Event Prioritization]({% image_buster /assets/img_archive/prioritization_options.png %}){: height="50%" width="50%"}
+
+The high, medium, and low options for triggered message priorities are buckets, and as such multiple messages could have the same selected priority. To set priorities within these buckets, click __Set Exact Priority__ and you will be able to drag and drop campaigns to order them with the correct priority.
+
+![Bucket Prioritization]({% image_buster /assets/img_archive/bucket_prioritization.png %}){: height="50%" width="50%"}
+
+__Canvas__
+
+It is possible that a customer will trigger two in-app messages within your Canvas at the same time. When this occurs, Braze will follow the priority order below to determine which in-app message is displayed. Drag different Canvas steps to re-order their priority. By default, steps earlier in a Canvas variant will display before later steps.
+
+![step_priority]({% image_buster /assets/img_archive/step_priority.png %}){: height="50%" width="50%"}
+
+Navigate to the “send settings” of the canvas section to prioritize in-app messages from a canvas against in-app messages from other canvases and campaigns.
+
+By default, canvas step priority is set to medium with the most recently created steps having the highest relative priority. Canvas/campaign level priorities also default to medium with the highest relative priority defaulting to the most recently created items.
+
+![canvas_priority]({% image_buster /assets/img_archive/canvas_priority.png %}){: height="50%" width="50%"}
+
+{% enddetails %}
+
+{% details Choose Target Segment %}
+
+Next, you need to choose the target segment from the dropdown menu. You'll automatically be given a snapshot of what that approximate segment population looks like right now. Keep in mind that exact segment membership is always calculated just before the message is sent.
+
+![Target Page]({% image_buster /assets/img_archive/target_page.png %}){: height="50%" width="50%"}
+
+{% enddetails %}
+
+{% details Choose Conversion Events %}
+
+Braze allows you to track how often users perform specific actions (Conversion Events) after receiving a campaign. You can specify any of the following actions as a "Conversion Event":
+
+- Opens App
+- Makes Purchase
+  - This can be a generic purchase or a specific item
+- Performs specific custom event
+
+You have the option of allowing up to a 30-day window during which a conversion will be counted if the user takes the specified action.
+
+![Conversion Event]({% image_buster /assets/img_archive/conversion_event_selection.png %}){: height="50%" width="50%"}
+
+{% enddetails %}
+
+<br>
+
+After you've finished building the last of your campaign or Canvas, review it's details, then send it!
+
+[1]: {% image_buster /assets/img_archive/newcampaign.png %}
+[2]: {% image_buster /assets/img/primary-secondary-buttons.png %}
+[3]: {% image_buster /assets/img_archive/InAppNewComposer.png %}
+[4]: {% image_buster /assets/img_archive/InAppNewComposer2.png %}
+[10]: {% image_buster /assets/img_archive/intelligent_delivery.png %}
+[11]: {{ site.baseurl }}/help/best_practices/client_integration_gallery/#client-integration-iam
+[13]: {% image_buster /assets/img_archive/InAppNewComposer3.png %}
+[14]: {% image_buster /assets/img_archive/InAppNewComposer4.png %}
+[15]: {% image_buster /assets/img_archive/in-app-choices.png %}
+[18]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/localization/#languages-supported
+[19]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/key_value_pairs/
+[22]: {% image_buster /assets/img/compose_iam.gif %}
+[22]: {% image_buster /assets/img/iam-generations.gif %}
+[24]: {% image_buster /assets/img/iam_compose.gif %}
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message.md
index 1e413092ec..7847c16022 100644
--- a/_docs/_user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message.md
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message.md
@@ -1,248 +1,5 @@
 ---
-nav_title: Creating an In-App Message
-platform: Message_Building_and_Personalization
-subplatform: In-App Messages
-page_order: 1
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/create/
 ---
-# Creating an In-App Message
-
-In-App Messages help you get content to your user without interrupting their day with a push notification. Customized and tailored in-app messages enhance the user experience and help your audience get the most value out of your app. With a variety of layouts and customization tools to choose from, in-app messages engage your users more than ever before.
-
-To see examples of in-app messages, check out our [Client Integration Gallery][11].
-
-## Step 1: Create New Campaign {#create-new-campaign-in-app}
-
-Click __Create Campaign__ to open a new messaging wizard for in-app message campaigns. Then, follow the flow of the messaging wizard to quickly create and launch your in-app message campaign.
-
-![createyouriam][21]
-
-
-1. Name your campaign something clear and meaningful.
-2. Add __Teams__ and __Tags__, as necessary.
-3. Add and name as many Variants as you need for this campaign.
-  - You can choose different platforms, message types, and layouts for each of your added Variants.
-  - _If all of the messages in your campaign are going to be similar or have the same content, compose your message before adding additional Variants - you will be able to choose **Copy from Variant** from the **Add Variant** dropdown._
-4. Choose a __Platform__, __Message Type__, __Layout__, and __Enforced Device Orientation__ as necessary.
-
-### Variant Options by Platform
-
-Click on your desired Platform tab to learn more about the Message Types, Layouts, and other options associated with it.
-
-{% tabs local %}
-{% tab Universal %}
-
-Universal In-App Messages are accepted by both mobile apps and web applications.
-
-#### Message Options
-
-| Message Type | Type Description | Available Layouts| Other Options |
-|---|---|---|
-|Full-Screen| Messages that cover the entire screen with a message block. | __Image & Text__ and __Image Only__ | Enforced Device Orientation (Portrait or Landscape)|
-|Modal|  Messages that cover the entire screen with a screen overlay and a message block. | __Text (with Optional Image)__ and __Image Only__ | None |
-|Slideup |  Messages that slide into view in a designated place without blocking the rest of the screen. | None | None |
-
-{% endtab %}
-{% tab Mobile App %}
-
-Mobile App In-App Messages are only accepted by mobile apps.
-
-#### Message Options
-
-| Message Type | Type Description |Available Layouts| Other Options |
-|---|---|---|
-|Custom HTML| Custom messages that perform as defined in your custom code (HTML, CSS, and/or Javascript).  |None | None |
-
-{% alert important %}
-If Braze detects that you don't have a close or dismissal button included in your code, we will request that you add one in. For your convenience, we have provided a snippet that you can copy and pasted into your code: `<a href="appboy://close">X</a>`.
-{% endalert %}
-
-{% endtab %}
-{% tab Web %}
-
-Web In-App Messages are only accepted by websites and applications.
-
-#### Message Options
-
-| Message Type | Type Description | Available Layouts| Other Options |
-|---|---|---|
-|Email Capture Form | Typically used to capture the viewer's email.  | None | None |
-|Custom Web Message | Custom messages that perform as defined in your custom code (HTML, CSS, and/or Javascript). | None | None |
-|Web Modal with CSS | Modal messages for web with customizable CSS. | __Text (with Optional Image)__ and __Image Only__ | None |
-
-{% endtab %}
-{% endtabs %}
-
-
-## Step 2: Compose In-App Message
-
-The Compose tab allows you to edit all aspects of your message’s content and behavior.
-
-![composeyouriam][22]
-
-
-The content of the Compose tab vary based on your chosen Message Options in the last step, but may include any of the options below:
-
-| Content | Options| Description |
-|---|---|---|
-|Language | See our [full list of available languages][18]. | Click __Add Lanaguages__ and select your desired languages from the provided list. This will insert liquid into your message. We recommend selecting your languages before writing your content so you can fill in your text where it belongs in the liquid. |
-|Image | __Upload Image__, __Pick a Badge__, or use __Font Awesome__. | Where applicable, click __Include Image__ or __Upload Image__ and follow the presented instructions. Each message type and platform may have it's own suggested proportions and requirements - be sure to check what those are before commissioning or making an image from scratch! |
-|Button Text & On Click Behavior| Add up to two buttons. | You can create and edit custom button text and color. You can also add  Terms of Service Link within Web Email Capture forms.  |
-|Device Options | Restrict send to only iOS devices. | Click __Change__ and check the box as desired. |
-|Message Close Options | __Dismiss Automatically__ or __Wait for User Swipe or Touch__. | __Dismiss Automatically__ allows you to select how many seconds the message will remain on the scree. __Wait for User Swipe or Touch__ will require a dismissal or close option.  |
-|Header & Body Text | Completely custom copy (often with custom HTML capabilities) with the options to include liquid and other types of personalization. | Some message types do not need and therefore do not ask for headers. |
-|Position | __From Bottom of App Screen__ or __From Top of App Screen__. | This only exists in the Universal Slideup message builder.|
-|HTML & Assets | Completely custom via upload, URL, or copy and paste. | Copy and paste HTML into the available space and upload your assets via ZIP. |
-|Email Capture Input Placeholder | Custom copy. | This is used solely in the Web Email Capture Form and will direct your users to input the desired content into the space. |
-
-### Buttons
-
-When available for your message type, you can have up to two buttons appear below your body of text. By default, the button on the right (Button 2) is formatted to be more visually drawing to your user. We recommend using this button for singular or primary actions.
-
-If you choose to only use one button, it will automatically adjust to take over the available space at the bottom of your message, instead of leaving room for an additional button.
-
-{% alert tip %}
-  If you decide to format these buttons with your own colors, we recommend that you use Button 2 for your more preferred result. In other words, if you want your user to click on one button more than the other, make sure it is on the right. The right button has often displayed better potential to get clicked, especially if it has a somewhat contrasting or otherwise stand-out color from the rest of the message. This is only emphasized when the button on the left blends more visually with the message.
-{% endalert %}
-
-## Step 3: Design In-App Message
-
-The Style tab allows you to adjust all visual aspects of your message. Upload an image or badge, or pick a pre-designed badge icon. Change the colors of the header and body text, buttons and background by selecting from a palette or entering a hex, RGB or HSB code.
-
-The content of the Style tab vary based on your chosen Message Options in the last step, but may include any of the options below:
-
-| Formatting | Input | Description |
-|---|---|---|
-|Color Profile | Apply from In-App Message Templates Gallery. | Click __Apply Template__ and select from gallery. Then, click __Save__. |
-|Text Alignment | Left, Center, or Right.  | Only available for newer Braze SDK versions. |
-|Header | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color.  |
-|Text | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. |
-|Buttons | HEX color code. | Your desired HEX colors will display. You will also be able to choose the opacity of the colors. You can choose colors for: the message's Close Button Background as well as each button's Background, Text, and Border. |
-|Background Color | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. This is the background of the entire message and will clearly display behind your text body. |
-|Frame Color | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. Only available for newer Braze SDK versions. This is the frame around the entire message. |
-|Chevron or other Close Message Option | HEX color code. | Your desired HEX color will display. You will also be able to choose the opacity of the color. |
-
-{% alert important %}
-Mobile Apps and Custom Web Messages do not have the option for Styling beyond uploading custom HTML (and/or CSS and/or Javascript) and assets via ZIP, as described in the Compose step above. Web Modal with CSS allows you to upload or write custom CSS to create beautiful, all around custom-styled messaging.
-{% endalert %}
-
-### Web Modal CSS
-
-If you choose to use a web-only, Web Modal with CSS message, you can [apply your own template][20] or write your own CSS in the provided space. This space is already pre-filled with the CSS shown in your message preview, and you should feel free to adjust it slightly to meet your needs.
-
-If you choose to apply your own template, click __Apply Template__ and choose from the In-App Message Template Gallery. If you don't have any options, you can upload a [CSS Template using the CSS Template builder][2].
-
-## Step 4: Configure Additional Settings
-
-Add [key-value pairs][19] to your message if needed.
-
-![InAppNewComposer3][13]
-
-## Step 5: Preview Message
-
-Preview what your message will look like to a random user, a specific user or a customized user - the latter two are especially useful if your message contains personalization or multiple languages. You can also preview messages for either mobile devices or tablets to get a better idea of what users will experience.
-
-![InAppNewComposer4][14]
-
-{% alert tip %}
-Additional customization of the appearance of your In-App Messages can be accomplished by your developers. See [our integration documentation on In-App Messages]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/) for more details.
-{% endalert %}
-
-## Step 6: Trigger Your Delivery
-
-![Schedule][6]
-
-In-app message delivery is entirely based off of of the following action triggers:
-
-- Making a purchase
-- Opening the app/webpage
-- Performing a custom event (only works with events sent via the SDK)
-- Opening a specific push message
-- Automatically schedule campaigns to send at a certain time with respect to the local time of each of your users.
-- Messages can also be configured to recur on a daily, weekly (optionally on specific days), or monthly basis.
-
-{% alert warning %}
-Unless you check the box titled "Allow users to become re-eligible to receive campaign" under the __Schedule__ portion of the campaign wizard, each user will only receive the contents of a campaign once, and only new users that meet the criteria will receive the campaign on subsequent deliveries.
-{% endalert %}
-
-A start date and time must be selected, however, an end date is optional. An end date will stop that specific in-app message from showing up on devices after the specified date/time.
-
-{% comment %}
-  Need to check whether this statement is true: An end date will stop that specific in-app message from showing up on devices after the specified date/time. - also whether "Opening a specific push message" trigger is direct opens or also includes influenced opens."
-{% endcomment %}
-
-Additionally, unless you check the box titled "Allow users to become re-eligible to receive campaign" in the campaign wizard, each user will only receive the contents of a campaign once, and only new users that meet the criteria will receive the campaign on subsequent deliveries.
-
-Finally, once you've selected the action the in-app message will be triggered off of, you should also set a priority. If two messages are triggered off of the same action, high priority messages will be scheduled to appear on users' devices before messages with lower priorities.
-
-![Event Prioritization][16]
-
-{% alert important %}
-  The high, medium, and low options for triggered message priorities are buckets, and as such multiple messages could have the same selected priority. To set priorities within these buckets, click __Set Exact Priority__ and you will be able to drag and drop campaigns to order them with the correct priority.
-{% endalert %}
-
-![Bucket Prioritization][17]
-
-## Step 7: Choose Target Segment
-
-Next, you need to choose the target segment from the dropdown menu. You'll automatically be given a snapshot of what that approximate segment population looks like right now. Keep in mind that exact segment membership is always calculated just before the message is sent.
-
-![Target Page][7]
-
-## Step 8: Choose Conversion Events
-
-Braze allows you to track how often users perform specific actions (Conversion Events) after receiving a campaign. You can specify any of the following actions as a "Conversion Event":
-
-- Opens App
-- Makes Purchase
-  - This can be a generic purchase or a specific item
-- Performs specific custom event
-
-You have the option of allowing up to a 30 day window during which a conversion will be counted if the user takes the specified action.
-
-![Conversion Event][12]
-
-## Step 9: Review and Deploy
-
-The final page will give you a summary of the campaign you've just designed. Clicking "Start Campaign" will enable it to send. Confirm all the relevant details and watch the data roll in!
-
-![confirm][8]
-
-## Step 10: Analyze Results Data
-
-For each in-app message campaign, Braze will show you impressions, unique impressions, clicks, revenue, and conversions.
-
-![Results][9]
-
-## Original In-App Messages {#original-in-app-messages}
-
-Braze moved over to a new form of in-app messages with the following SDK releases:
-
-- iOS: 2.19.0
-- Android: 1.13.0
-- Web: 1.3.0
-
-Prior to these releases, Braze supported "original in-app messages." Support for original in-app messages will be provided for any customer who ran an in-app campaign prior to the new release. All of the campaign stats are unaffected by the change, and those who've sent original in-app messages will have the opportunity to send others via the "Create Campaign" button on the campaign screen.
-
-![Choices][15]
-
-[1]: {% image_buster /assets/img_archive/newcampaign.png %}
-[2]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/in_app_message_color_templates/
-[3]: {% image_buster /assets/img_archive/InAppNewComposer.png %}
-[4]: {% image_buster /assets/img_archive/InAppNewComposer2.png %}
-[6]: {% image_buster /assets/img_archive/in-app-schedule.png %}
-[7]: {% image_buster /assets/img_archive/target_page.png %}
-[8]: {% image_buster /assets/img_archive/confirm.png %}
-[9]: {% image_buster /assets/img_archive/new-iam-stats.png %}
-[10]: {% image_buster /assets/img_archive/intelligent_delivery.png %}
-[11]: {{ site.baseurl }}/help/best_practices/client_integration_gallery/#client-integration-iam
-[12]: {% image_buster /assets/img_archive/conversion_event_selection.png %}
-[13]: {% image_buster /assets/img_archive/InAppNewComposer3.png %}
-[14]: {% image_buster /assets/img_archive/InAppNewComposer4.png %}
-[15]: {% image_buster /assets/img_archive/in-app-choices.png %}
-[16]: {% image_buster /assets/img_archive/prioritization_options.png %}
-[17]: {% image_buster /assets/img_archive/bucket_prioritization.png %}
-[18]: {{ site.baseurl }}/developer_guide/platform_integration_guides/android/advanced_use_cases/localization/#languages-supported
-[19]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/key_value_pairs/
-[20]: {{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/in_app_message_color_templates/#css-template
-[21]: {% image_buster /assets/img/create_iam.gif %}
-[22]: {% image_buster /assets/img/compose_iam.gif %}
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/creative_details.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/creative_details.md
new file mode 100644
index 0000000000..d79ce5bb54
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/creative_details.md
@@ -0,0 +1,149 @@
+---
+nav_title: Creative Details
+page_order: 4
+layout: featured
+guide_top_header: "Creative Details"
+guide_top_text: "Get creative with our in-app messages! But you should know some of the guidelines, first! After all, you have to know that rules to break them! Check out the individual message type's Creative Specs or the global Creative Details below."
+
+guide_featured_title: "Message Type Creative Specs"
+guide_featured_list:
+- name: Modal
+  link: /docs/user_guide/message_building_by_channel/in-app_messages/creative_details/#modal
+  image: /assets/img/icon_modal.png
+- name: Slideup
+  link: /docs/user_guide/message_building_by_channel/in-app_messages/creative_details/#slideup
+  image: /assets/img/icon_slideup.png
+- name: Full-Screen
+  link: /docs/user_guide/message_building_by_channel/in-app_messages/creative_details/#full-screen
+  image: /assets/img/icon_full_screen.png
+---
+
+# Creative Details {#general}
+
+Braze in-app messages have both global and individual creative specifications. For more information on our more customizable in-app message types, go to our [Customize]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/) page.
+
+
+{% alert important %}
+  These details only apply to our most recent in-app message generation (Generation 3). If you are not using our newest generation of in-app messages, check out our [previous in-app message generations]({{ site.baseurl }}/help/best_practices/in-app_messages/previous_in-app_message_generations/) documentation.
+{% endalert %}
+
+
+## Character and Image Limits
+
+| Type                               | Aspect Ratio | Recommended Image Size | Max Image Size |   File Types  |
+|------------------------------------|:------------:|:----------------------:|:--------------:|:-------------:|
+| Portrait Full Screen (With Text)   |      5:4     |          500KB         |       5MB      | PNG, JPG, GIF |
+| Portrait Full Screen (Image Only)  |     10:16    |          500KB         |       5MB      | PNG, JPG, GIF |
+| Landscape Full Screen (With Text)  |     16:5     |          500KB         |       5MB      | PNG, JPG, GIF |
+| Landscape Full Screen (Image Only) |     16:10    |          500KB         |       5MB      | PNG, JPG, GIF |
+| Slideup                            |      1:1     |          500KB         |       5MB      | PNG, JPG, GIF |
+| Modal (Image Only)                 |      1:1     |          500KB         |       5MB      | PNG, JPG, GIF |
+| Modal (With Text)                  |     29:10    |          500KB         |       5MB      | PNG, JPG, GIF |
+
+## Font Awesome
+
+Though Braze supports using [Font Awesome](https://fontawesome.com/) in our in-app messages, we recommend testing your message before sending if you are using Font Awesome.
+
+## Safe Zone
+
+An Image Safe Zone in an in-app message designates the area that is guaranteed to show in your message, no matter the device on which the message is displayed. To prevent your message's media from being cut off, we recommend that you put a safe amount of padding around the bulk of your image. See our [Creative Specs](#creative-specs) below for each message type for more information on these specs.  
+
+A Device Safe Zone in an in-app message designates the area within which your message will show on a device. This safe zone will buffer your message from disappearing behind the borders and the edges of almost any device.
+
+## Font Defaults
+If you are using the newest generation of in-app messages (Generation 3), you'll find that the fonts default to the Operating System default Sans Serif for iOS and Android. Web in-app messages will default to Helvetica.
+
+## Gifs & Videos
+
+Braze currently supports gifs for Web (included), [Android]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/gifs/), and iOS (included) in-app messaging, given that it has been enabled during the desired platform integration. For more on video in in-app messages, see our [Customization documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/#video).
+
+# Creative Specs
+
+In-app messages aren't just messaging, they're an extension of your app, directly to your customer. We understand that they're a work of art and these things require precision. To ease the guesswork, we've provided maps of our specs for each of our message types ([Modal](#modal), [Slideup](#slideup), [Full-Screen](#full-screen)). Check them out and get messaging!
+
+## Modal
+
+Modals appear in the center of the device's screen with a screen overlay that helps it stand out from your app in the background. These are perfect for not-so-subtly suggesting that your user take advantage of a sale or giveaway.
+
+<br>
+
+![Modal Specs][1a]{: style="max-width: 80%;" }
+
+<br>
+
+| Element | Specification | Details |
+|---|---|---|
+| Modal Size |450px Maximum Width <br> 720px Maximum Height | There is a 720px maximum height, at which point the message scrolls vertically.|
+| Image Size | 29:10 Aspect Ratio <br> 450px by 155px Image Container | Accepts high resolution, PNG, JPEG, GIF. |
+| Copy | 20px Header Text - Bolded <br> 14px Message Text - Regular Weight | We cannot recommend character or word limits.|
+| Primary & Secondary Action Buttons | Secondary on the Left <br> Primary on the Right | We recommend contrasting your buttons to present the desired choice to the user with the right button, designating it as the Primary Action. |
+| Screen Overlay | Transparent | This is a customizable, transparent film that lays between your app and the message.
+| Device Safe Zone | 15px Margin | This margin is additional padding around the edges of the device. |
+
+### Modal Viewport
+
+On a tablet or desktop browser, a modal in-app message will still sit in the center of the app screen as shown below.
+
+<br>
+
+![Modal Viewport][1b]{: style="max-width: 80%;" }
+
+<br>
+
+## Slideup
+
+Our Slideups typically appear at the top or bottom of the app screen (you can set this when you create your message). These are great for alerting your users about new terms of service, cookies, and other snippets of information.
+
+<br>
+
+![Slideup Specs][2a]{: style="max-width: 50%;" }
+
+<br>
+
+| Element | Specification | Details |
+|---|---|---|
+| Slideup Size | 450px Maximum Width | 3-Line maximum height, at which point the message is truncated with an ellipsis. |
+| Image/Icon Size | 50px by 50px | These images are optional, but always appear on the left side of the message. |
+| Copy | 14px - Bolded | Three lines of text will appear before being truncated with an ellipsis. |
+| Device Safe Zone | 10px Margin | This margin is additional padding around the edges of the device. |
+
+### Slideup Viewport
+
+On a tablet or desktop browser, a slideup in-app message will sit in the corner of the app screen as shown below (unless designated otherwise when creating the in-app message).
+
+<br>
+![Slideup Viewport][2b]{: style="max-width: 80%;" }
+<br>
+
+## Full-Screen
+
+Full-Screen messages take up the whole screen of the device! This message type is great when you really need your user's attention, like for mandatory app updates.
+
+<br>
+
+![Full-Screen Specs][3a]{: style="max-width: 80%;" }
+
+<br>
+
+| Element | Specification | Details |
+|---|---|---|
+| Text & Image - Image Size | 5:4 Aspect Ratio <br> 450px by 360px Image Container | Accepts high resolution, PNG, JPEG, GIF. |
+| Image Only - Image Size | 10:16 Aspect Ratio <br> 450px by 720px Image Container | Accepts high resolution, PNG, JPEG, GIF. |
+| Image Safe Zone | 10% Top & Bottom Safe Zone <br> 14% Left & Right Safe Zone | These safe zones act as recommended boundaries. You should keep the most important parts of your image to it's center.
+| Copy | 20px Header Text - Bolded <br> 14px Message Text - Regular Weight | We cannot recommend character or word limits.|
+| Primary & Secondary Action Buttons | Secondary on the Left <br> Primary on the Right | We recommend contrasting your buttons to present the desired choice to the user with the right button, designating it as the Primary Action. |
+
+### Full-Screen Viewport
+
+On a tablet or desktop browser, a full-screen in-app message will sit in the center of the app screen as shown below.
+
+<br>
+![Full-Screen Viewport][3b]{: style="max-width: 80%;" }
+<br>
+
+[1a]: {% image_buster /assets/img/modal-spec.png %}
+[1b]: {% image_buster /assets/img/modal-large-viewport.png %}
+[2a]: {% image_buster /assets/img/slideup-spec.png %}
+[2b]: {% image_buster /assets/img/slideup-large-viewport.png %}
+[3a]: {% image_buster /assets/img/full-screen-spec.png %}
+[3b]: {% image_buster /assets/img/full-screen-large-viewport.png %}
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/customize.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/customize.md
new file mode 100644
index 0000000000..a81dc502b6
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/customize.md
@@ -0,0 +1,206 @@
+---
+nav_title: Customize
+platform: Message_Building_and_Personalization
+subplatform: In-App Messages
+page_order: 5
+---
+
+# Customization
+
+You can either use our [Customizable In-App Message Types](#customizable-in-app-message-types) ([Web Modal CSS](#web-modal-css), [Custom Web Messages](#custom-web-messages), or the [Email Capture Form](#email-capture-form)), which will allow you to refine specific types of messages with precise granularity, or create [Custom In-App Message Templates](#in-app-message-templates) to use over and over again. You can also put [video](#video) into your messages.
+
+## Customizable In-App Message Types
+
+{% alert tip %}
+Additional customization of the appearance of your In-App Messages can be accomplished by your developers. See our [iOS]({{ site.baseurl }}/developer_guide/platform_integration_guides/ios/in-app_messaging/customization/), [Web]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/in_app_messaging/#in-app-message-customization), or [Android]({{ site.baseurl }}/developer_guide/platform_integration_guides/android/in-app_messaging/customization/) integration documentation on In-App Messages for more details.
+{% endalert %}
+
+### Web Modal CSS
+
+If you choose to use a web-only, Web Modal with CSS message, you can [apply your own template](#css-template) or write your own CSS in the provided space. This space is already pre-filled with the CSS shown in your message preview, and you should feel free to adjust it slightly to meet your needs.
+
+If you choose to apply your own template, click __Apply Template__ and choose from the In-App Message Template Gallery. If you don't have any options, you can upload a [CSS Template using the CSS Template builder](#in-app-message-templates).
+
+### Custom Web Messages
+
+While Braze’s out-of-the box in-app messages can be customized in a variety of ways, you can gain even greater control over the look and feel of your campaigns using messages designed and built using HTML, CSS, and Javascript. With some simple composition, you can unlock custom functionality and branding to match any of your needs. HTML in-app messages allow for greater control over the look and feel of a message, and anything supported by HTML5 is also supported by Braze.
+
+#### JavaScript Bridge (appboyBridge)
+
+HTML in-app messages support a Javascript "bridge" interface to the Braze Web SDK, allowing you to trigger custom Braze actions when users click on elements with links or otherwise engage with your content. The following javascript methods are supported in Braze's HTML in-app messages:
+
+{% include archive/appboyBridge.md platform="web" %}
+
+Additionally, for analytics tracking, any `<a>` or `<button>` elements in your HTML will automatically log a "click" action to the campaign associated with the in-app message. To log a "button click" instead of a "body click," either provide a query string value of abButtonId on your link's href (e.g. `<a href="http://mysite.com?abButtonId=0">click me</a>`), or provide an id on the HTML element (e.g. `<a id="0" href="http://mysite.com">click me</a>`). Note that the only button ids currently accepted are "0" and "1." A link with a button id of 0 will be represented as "Button 1" on the Dashboard, while a link with a button id of 1 will be represented as "Button 2."
+
+{% alert note %}
+  To enable HTML in-app messages, your SDK integration must supply the `enableHtmlInAppMessages` initialization option to Braze: for example `appboy.initialize('YOUR-API_KEY', {enableHtmlInAppMessages: true})`. This is for security reasons - HTML in-app messages can execute javascript so we require a site maintainer to enable them.
+{% endalert %}
+
+#### HTML In App-Message Templates
+
+We've designed a set of HTML5 in-app messages templates to help you get started. Check out our [Github repository][22] which contains detailed instructions on how to use and customize these templates for your needs.
+
+##### Customizable Features
+- Fonts
+- Styles
+- Images + Videos
+- On-click behaviors
+- Interactive Components
+- Animation
+
+### Email Capture Form
+Email capture messages allow you to easily prompt users of your site to submit their email address, after which it will be available within the Braze system for use in all your messaging campaigns.
+
+{% alert note %}
+To enable Email Capture in-app messages, your SDK integration must supply the `enableHtmlInAppMessages` initialization option to Braze, e.g. `appboy.initialize('YOUR-API_KEY', {enableHtmlInAppMessages: true})`. This is for security reasons - HTML in-app messages can execute javascript so we require a site maintainer to enable them.
+{% endalert %}
+
+#### Customizable Features
+- Header, body, and submit button text
+- An optional image
+- An optional "Terms of Service" link
+- Different colors for the header and body text, buttons and background
+- Key-value pairs
+- Style for header and body text, buttons, button border color, background, and overlay
+
+## In-App Message Templates
+
+You can save in-app message and in-browser message templates on the dashboard to swiftly build new campaigns and messages using your style. Go to __Templates & Media__, then the __In-App Message Templates__ tab. From this page, you can either edit existing templates, or click __+ Create__ and choose __Color Profile__ or __CSS Template__ to create new templates to use in your in-app messages.
+
+### Color Profile
+
+You can customize the color scheme of your message template by either entering HEX color code or by clicking the colored box and selecting a color with the color picker.
+
+Click __Save Color Profile__ on the bottom right when you’re finished.
+
+### CSS Template
+
+You can customize a complete CSS template for your [Web Modal In-App Message](#web-modal-css).
+
+Name and tag your CSS Template, then choose whether or not it will be your default template. You can write your own CSS in the provided space. This space is already pre-filled with the CSS shown in your message preview, and you should feel free to adjust it slightly to meet your needs.
+
+```css
+.ab-message-header, .ab-message-text {
+  color: #333333;
+  text-align: center;
+}
+
+.ab-message-header {
+  font-size: 20px;
+  font-weight: bold;
+}
+
+.ab-message-text {
+  font-size: 14px;
+  font-weight: normal;
+}
+
+.ab-close-button svg {
+  fill: #9b9b9b;
+}
+
+.ab-message-button {
+  border: 1px solid #1b78cf;
+  font-size: 14px;
+  font-weight: bold;
+}
+.ab-message-button:first-of-type {
+  background-color: white;
+  color: #1b78cf;
+}
+.ab-message-button:last-of-type, .ab-message-button:first-of-type:last-of-type {
+  background-color: #1b78cf;
+  color: white;
+}
+
+.ab-background {
+  background-color: white;
+}
+
+.ab-icon {
+  background-color: #0073d5;
+  color: white;
+}
+
+.ab-page-blocker {
+  background-color: rgba(51, 51, 51, .75);
+}
+```
+
+As you can see, you can edit everything from the background color to font size and weight, and so much more.
+
+## Video
+
+You are able to display HTML5 videos in our customizable in-app message types with sound included. You can either use an embedded link from a third party (like [Youtube](https://support.google.com/youtube/answer/171780?hl=en)) using custom a HTML5 file, or upload a video to your Braze account in the `assets.zip` folder. This uploaded video will then be sent to the device for local playback, so there is no need for a network connection to play the video. This second option is recommended mostly for shorter videos.
+
+{% tabs %}
+  {% tab Android %}
+
+__Android__
+
+To use a video in Android in-app messages, all you need to do is create a custom HTML5 file [using one of our templates on Github](https://github.com/Appboy/appboy-custom-html5-in-app-message-templates).
+
+Then, copy and paste the following `HTML` snippet into your code, replacing the source parameters with your actual file names.
+
+```
+<video class="video" autoplay muted playsinline controls>
+          <source src="mov_bbb.mp4" type="video/mp4">
+          <source src="mov_bbb.ogg" type="video/ogg">
+          Your device does not support HTML5 video.
+</video>
+```
+
+Then, in your working directory, add the video file and zip all the files. Make sure to include the `CSS/JavaScript` but exclude the `HTML`.
+
+Finally, upload the files to your Braze account using the HTML + Asset Zip in your In-App Message Compose tab. You can either upload the ZIP or enter it's URL.
+
+![Video_IAM]({% image_buster /assets/img/video_iam.png %})
+{% endtab %}
+
+{% tab iOS %}
+__iOS__
+
+To use a video in iOS in-app messages, you may require developer assistance. You are required to create a custom view controller in order to allow inline playback of HTML5 videos. You are able to modify our default view controller [here](https://github.com/Appboy/appboy-ios-sdk/blob/master/AppboyUI/ABKInAppMessage/ViewControllers/ABKInAppMessageHTMLViewController.m) to make this process simpler.
+
+Modify the file using the following snippets:
+
+__UIWebView Settings__
+```
+webView.allowsInlineMediaPlayback = YES;
+webView.mediaPlaybackRequiresUserAction = NO;
+```
+
+__WKWebView Settings__
+```
+WKWebViewConfiguration *config = [WKWebViewConfiguration new];
+config.allowsInlineMediaPlayback = YES;
+config.mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeVideo;
+```
+
+Then, add the following snippet to your HTML code and use the code in your message.
+
+```
+<video class="video" playsinline autoplay>
+          <source src="mov_bbb.mp4" type="video/mp4">
+          <source src="mov_bbb.ogg" type="video/ogg">
+          Your device does not support HTML5 video.
+</video>
+```
+
+Then, in your working directory, add the video file and zip all the files. Make sure to include the `CSS/JavaScript` but exclude the `HTML`.
+
+Finally, upload the files to your Braze account using the HTML + Asset Zip in your In-App Message Compose tab. You can either upload the ZIP or enter it's URL.
+
+![Video_IAM]({% image_buster /assets/img/video_iam.png %})
+
+{% endtab %}
+
+{% tab Web %}
+
+__Web__
+
+To use a video in Web in-app messages, embed a link from a third party (like [Youtube](https://support.google.com/youtube/answer/171780?hl=en)) into your [Custom Web Message]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/customize/#custom-web-message).
+
+{% endtab %}
+{% endtabs %}
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/generations.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/generations.md
new file mode 100644
index 0000000000..ac2945d8d4
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/generations.md
@@ -0,0 +1,17 @@
+---
+nav_title: Generations
+hidden: true
+---
+
+# In-App Messages Generations
+
+Braze currently has three generations of in-app messages. Each comes with it own level of support. To take advantage of the newest features of our in-app messages, we recommend upgrading to the newest [Web]({{ site.baseurl }}/developer_guide/platform_integration_guides/web/initial_sdk_setup/#upgrading-the-sdk), iOS, and Android SDKs.
+
+This chart highlights the features and message types that are currently available and when they were introduced in each generation. This chart also explicitly states what isn't supported within a given generation.
+
+|Generation 1 | Generation 2 | __Generation 3__ |
+|---|---|---|
+| __Initial launch of:__ <br> - Full-Screen message type with in-app triggering <br> - Modal message type with in-app triggering <br> - Slideup message type with in-app triggering | __Customization Features:__ <br> - Text Alignment <br> - Overlay behind Modal <br> Image Safe Zone <br>   <br> __Introduced:__ <br> - Custom HTML <br> - Email Capture Form <br> - Custom CSS for Web Modal | __Customization Features:__ <br> - Button Border Color <br>    <br> __Introduced:__ <br> - Button Border <br>  - Refined Look & Feel <br>  - Generation 3 Language with SDK Compatibility Messaging <br>  - New Close `X` Asset <br>  - Accessibility Improvements on Web <br> |
+| __Unsupported__: <br> - Custom HTML <br> - Email Capture Form <br> - Custom CSS | __Unsupported__: <br> - Button Border | __Warning:__ <br> May break some custom overrides. |
+
+[1]: {% image_buster /assets/pdf/IAM_Gen_Diff.xlsx %}
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/in_app_message_color_templates.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/in_app_message_color_templates.md
index 17c0ab3768..866b184b80 100644
--- a/_docs/_user_guide/message_building_by_channel/in-app_messages/in_app_message_color_templates.md
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/in_app_message_color_templates.md
@@ -1,68 +1,5 @@
 ---
-nav_title: Color Templates
-platform: Message_Building_and_Personalization
-subplatform: In-App Messages
-page_order: 2
+hidden: true
+layout: redirect
+redirect_to: /docs/help/best_practices/in-app_messages/customize/in-app-message-color-templates
 ---
-# In-App Message Templates {#in-app-message-color-templates}
-
-You can save in-app message and in-browser message templates on the dashboard to swiftly build new campaigns and messages using your style. Go to __Templates & Media__, then the __In-App Message Templates__ tab. From this page, you can either edit existing templates, or click __+ Create__ and choose __Color Profile__ or __CSS Template__ to create new templates to use in your in-app messages.
-
-
-
-## Color Profile {#adding-a-color-profile}
-
-You can customize the color scheme of your message template by either entering HEX color code or by clicking the colored box and selecting a color with the color picker.
-
-Click __Save Color Profile__ on the bottom right when you’re finished.
-
-## CSS Template
-
-You can customize a complete CSS template for your [Web Modal In-App Message][6].
-
-Name and tag your CSS Template, then choose whether or not it will be your default template. You can write your own CSS in the provided space. This space is already pre-filled with the CSS shown in your message preview, and you should feel free to adjust it slightly to meet your needs.
-
-```css
-.ab-message-header, .ab-message-text {
-  color: #252525;
-  text-align: center;
-}
-
-.ab-message-header {
-  font-size: 19px;
-  font-weight: bold;
-}
-
-.ab-message-text {
-  font-size: 14px;
-  font-weight: normal;
-}
-
-.ab-close-button {
-  color: #c4c4c4;
-}
-
-.ab-message-button {
-  background-color: #1b78cf;
-  color: #ffffff;
-  font-size: 12px;
-  font-weight: bold;
-}
-
-.ab-background {
-  background-color: #f7f7f7;
-}
-
-.ab-icon {
-  background-color: #0073d5;
-  color: white;
-}
-
-.ab-page-blocker {
-  background-color: rgba(51, 51, 51, .75);
-}
-```
-As you can see, you can edit everything from the background color to font size and weight, and so much more.
-
-
-[6]: {{ site.baseurl }}/creating_an_in-app_message/#step-2-compose-in-app-message
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/overview.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/overview.md
new file mode 100644
index 0000000000..9fe8faa4ee
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/overview.md
@@ -0,0 +1,76 @@
+---
+nav_title: Overview
+page_order: 0
+---
+
+# In-App Messages
+
+__In-App Messages__ help you get content to your user without interrupting their day with a push notification. Customized and tailored in-app messages enhance the user experience and help your audience get the most value out of your app. With a variety of layouts and customization tools to choose from, in-app messages engage your users more than ever before.
+
+To see examples of in-app messages, check out our [Client Integration Gallery][11].
+
+{% alert note %}
+Braze has refreshed in-app messages! Though the creation process is very much the same, our in-app messages have a new, modern look and feel optimized for the best experiences for your customers and give you more options to personalize the experience. For more information on our most recent upgrades and how to apply them to your messages, check out our [Generation Comparison documentation]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/generations/)!
+{% endalert %}
+
+[Create an in-app message]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/create/) now!
+
+## When to Use In-App Messages
+
+In-app messages are good for a lot of things. These messages don't deliver outside of the user's app and won't intrude on their home screen. In-app messages, by their nature, exist within your app and come with context and are almost never unwelcome! They're always delivered when the user is active within your app.
+
+### Great Use Cases
+
+- New App Features
+- App Management
+- Reviews
+- App Upgrades/Updates
+- Giveaways & Sweepstakes
+- Sales and Promotions
+- Product Sales
+- Encouraging and rewarding discovery
+- [Permission Requests/Push Priming][21]
+
+## Expected Behaviors by Message Types
+
+These are what it looks like for your users to open one of our out-of-the-box in-app message types.
+
+{% tabs %}
+  {% tab Slideup %}
+
+  Our Slideups typically appear at the top and bottom of the app screen (you can set this when you create your message). These are great for alerting your users about new terms of service, cookies, and other snippets of information.
+
+  <br>
+
+  ![Slideup Behavior]({% image_buster /assets/img/slideup-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+{% endtab %}
+{% tab Modal %}
+
+  Modals appear in the center of the device's screen with a screen overlay that helps it stand out from your app in the background. These are great call-to-action These are perfect for not-so-subtly suggesting that your user take advantage of a sale or giveaway.
+
+  <br>
+
+  ![Modal Behavior]({% image_buster /assets/img/modal-behavior.gif %}){: style="border:0px;"}
+
+  <br>
+
+{% endtab %}
+{% tab Full-Screen %}
+
+Full-Screen messages are exactly what you'd expect - they take up the whole screen of the device! This message type is great when you really need your user's attention, like for mandatory app updates.
+
+<br>
+
+![Full-Screen Behavior]({% image_buster /assets/img/full-screen-behavior.gif %}){: style="border:0px;"}
+
+<br>
+
+{% endtab %}
+{% endtabs %}
+
+[1]: http://yuml.me/e4562a3d.png
+[11]: {{ site.baseurl }}/help/best_practices/client_integration_gallery/#client-integration-iam
+[21]: {{ site.baseurl }}/help/best_practices/push/creating_custom_opt-in_prompts/#creating-custom-opt-in-prompts
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/reporting.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/reporting.md
new file mode 100644
index 0000000000..236201965d
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/reporting.md
@@ -0,0 +1,73 @@
+---
+nav_title: Reporting & Analytics
+page_order: 7
+---
+
+# Reporting & Analytics {#IAM-Reporting}
+
+
+## In-App Message Analytics Glossary
+
+In reporting for in-app messages, you'll see various reports on the following metrics.
+
+| Metric | Definition |
+|---|---|
+| Sends | The total number of messages sent in this campaign.
+| Total Impressions | The number of users whose devices reported that the in-app message has been delivered (if you receive it twice, you will be counted as twice).
+| Unique Impressions | The total number of people who actually received and viewed the in-app message (if you receive it twice, you will be only counted as one user). |
+| Unique Recipients | Exact number of users who received a particular message.
+| Total Conversions | The total number of times every defined event occurred. This defined event is determined by the marketer when building the campaign. |
+| Primary Conversion Event | The number of times a defined event occurred. This defined event is determined by the marketer when building the campaign. |
+| Revenue | The total revenue in dollars from campaign recipients within the set primary conversion window. |
+| Body Clicks| Occurs when someone clicks on a slideup, modal, or full-screen in-app message that has no buttons. |
+| Button Clicks | Total number of clicks on a certain button of the message. |
+
+{% comment %}
+Reporting in Canvas
+
+In Canvas, you'll see in-app message performance mapped onto the Canvas you've created. You can use the control panel at the top of the page to uncheck other messaging types and only view the in-app messages in your Canvas.
+
+![In-App_Message_Canvas_Reporting]({% image_buster /assets/img/in-app-message-canvas-reporting.png %})
+
+{% endcomment %}
+
+## Reporting in Campaigns
+
+Campaigns will deliver your reports in a series of blocks. You may see more or less than those listed in the tabs below, but each has their own useful purpose.
+
+{% tabs %}
+
+{% tab Campaign Details %}
+
+__Campaign Details__
+
+The Campaign Details analytics block will give you a high-level overview of the entire in-app message campaign.
+
+![In-App_Message_Campaign_Details]({% image_buster /assets/img/in-app-message-campaign-details.png %})
+
+{% endtab %}
+
+{% tab Message Performance %}
+
+__Message Performance__
+
+This block will define the messages performance on multiple levels (by Variant, Audience %, Unique Impressions, Impressions, Body Clicks, Button Clicks, Revenue, Primary Conversions, and more!). Click on the <i class="fa fa-eye preview-icon"></i> to view your message.
+
+![In-App_Message_Message_Performance]({% image_buster /assets/img/in-app-message-message-performance.png %})
+
+{% endtab %}
+
+{% tab Historical Performance %}
+
+__Historical Performance__
+
+This block allows you to see the message's performance over a set time period on a timeline.
+
+![In-App_Message_Historical_Performance]({% image_buster /assets/img/in-app-message-historical-performance.png %})
+
+{% endtab %}
+{% endtabs %}
+
+{% comment %}
+If you select to only sent to users who can see the latest Braze version of in-app messages (Generation 3), your Target Audience will not adjust to reflect your choice.
+{% endcomment %}
diff --git a/_docs/_user_guide/message_building_by_channel/in-app_messages/testing.md b/_docs/_user_guide/message_building_by_channel/in-app_messages/testing.md
new file mode 100644
index 0000000000..1bec752554
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/in-app_messages/testing.md
@@ -0,0 +1,49 @@
+---
+nav_title: Testing
+page_order: 6
+---
+
+# Testing
+
+It is __extremely important__ to __always__ test your in-app messages before sending your campaigns. Our preview and testing capabilities offer two ways to take a look at your in-app messages. You can preview your message, to help you visualize as you compose it, as well as send a test message to a your or a specific user's device. We recommend you take advantage of __both__.
+
+## Preview
+
+You can preview your in-app message as you compose it. This should help you visualize what your final message will look like from your user's perspective.
+
+{% alert warning %}
+In __Preview__, the view of your message might not be identical to it's actual rendering on the user's device. We __always__ recommend sending a test message to a device to ensure that your media, copy, personalization, and custom attributes generate correctly.
+{% endalert %}
+
+### IAM Generation Preview
+
+Preview what your message will look like to a random user, a specific user or a customized user - the latter two are especially useful if your message contains personalization or multiple languages. You can also preview messages for either mobile devices or tablets to get a better idea of what users will experience.
+
+![In-App_Message_Preview][1]
+
+Braze has three generations of in-app messages available. You can fine-tune to which devices your messages should be sent, based on which Generation they support.
+
+![In-App_Messages_Generations][2]{: height="50%" width="50%"}
+
+## Test
+
+{% alert warning %}
+  To send a test to either [Content Test Groups]({{ site.baseurl }}/user_guide/administrative/app_settings/developer_console/internal_groups_tab/#content-test-groups) or individual users, push must be enabled on your test devices before sending.
+{% endalert %}
+
+### Preview Message As User
+
+You can also preview messages from the Test tab, as though you were a user. You can select a specific user, a random user, or create a custom user.
+
+![Custom_User_Preview][3]
+
+### Test Checklist
+
+- Do the images and media show up and act as expected?
+- Does the liquid function as expected? Have you accounted for a [default attribute value]({{ site.baseurl }}/user_guide/personalization_and_dynamic_content/liquid/conditional_logic/#accounting-for-null-attribute-values) in the event that the liquid returns no information?
+- Is your copy clear, concise, and correct?
+- Do your buttons direct the user where they should go?
+
+[1]: {%image_buster /assets/img/in-app-message-preview.png %}
+[2]: {% image_buster /assets/img/iam-generations.gif %}
+[3]: {% image_buster /assets/img/iam-user-preview.png %}
diff --git a/_docs/_user_guide/message_building_by_channel/overview.md b/_docs/_user_guide/message_building_by_channel/overview.md
index 53d946ec75..932893c192 100644
--- a/_docs/_user_guide/message_building_by_channel/overview.md
+++ b/_docs/_user_guide/message_building_by_channel/overview.md
@@ -1,18 +1,25 @@
 ---
 nav_title: Overview
 page_order: 0
----
-
-# About Messaging Channels
-
-Messaging channels are ways you can virtually communicate with your customers - through push notifications on their phone or web browser, email, in-app messages, and so much more! If you want to learn more about these channels and how to utilize them with Braze, check out the docs on our available channels:
+layout: featured
+guide_top_header: "About Messaging Channels"
+guide_top_text: "Messaging channels are ways you can virtually communicate with your customers - through push notifications on their phone or web browser, email, in-app messages, and so much more! If you want to learn more about these channels and how to utilize them with Braze, check out the docs on our available channels."
 
-* [Email]({{ site.baseurl }}/user_guide/message_building_by_channel/email/creating_an_email_campaign/)
+guide_featured_title: "Available Messaging Channels"
+guide_featured_list:
+- name: Email Messaging
+  link: /docs/user_guide/message_building_by_channel/email/creating_an_email_campaign/
+  image: /assets/img/email-msg-chn.png
+- name: In-App Messaging
+  link: /docs/user_guide/message_building_by_channel/in-app_messages/create/
+  image: /assets/img/in-app-msg-chn.png
+- name: Push Messaging
+  link: /docs/user_guide/message_building_by_channel/push/creating_a_push_message/
+  image: /assets/img/icon_full_screen.png
+- name: Webhooks
+  link: /docs/user_guide/message_building_by_channel/webhooks/creating_a_webhook/
+  image: /assets/img/webhook-msg-chn.png
 
-* [In-App Messages]({{ site.baseurl }}/user_guide/message_building_by_channel/in-app_messages/creating_an_in-app_message/)
-
-* [Push]({{ site.baseurl }}/user_guide/message_building_by_channel/push/creating_a_push_message/)
-
-* [Webhooks]({{ site.baseurl }}/user_guide/message_building_by_channel/webhooks/creating_a_webhook/)
+---
 
 Or, check out [our LAB course on Messaging Channels](http://lab.braze.com/channels-course)!
diff --git a/_docs/_user_guide/message_building_by_channel/push/push_stories.md b/_docs/_user_guide/message_building_by_channel/push/push_stories.md
index 214f0fcaae..027e245b6b 100644
--- a/_docs/_user_guide/message_building_by_channel/push/push_stories.md
+++ b/_docs/_user_guide/message_building_by_channel/push/push_stories.md
@@ -14,6 +14,9 @@ Push Stories is a new type of Push Notification introduced by Braze (formerly kn
 | :-----: | :----------: |
 | ![AndroidPreview][1] | ![IOSPreview][2] |
 
+{% alert note %}
+On iOS versions 3.13.0+, due to a change in how the SDK downloads images, a thumbnail of the first image will not show on the condensed view of the push. You should ensure that your message copy prompts users to expand the push to see the images.
+{% endalert %}
 
 ## How it works
 _Pre-req: Clients must update to the latest version of Android(version:2.2.0+) and IOS (version: 3.2.0+)_
@@ -34,6 +37,10 @@ To create a page:
 * Title/Description for each page can also be inserted (if inserted for one page, they must be inserted for all pages).
 * The previews will be reflected and are interactive.
 
+{% alert important %}
+If you are pulling in images with [Connected Content]({{ site.baseurl }}/user_guide/personalization_and_dynamic_content/connected_content/about_connected_content/#about-connected-content), please ensure that your image URL begins with `https://`. Using `http://` will crash your app.
+{% endalert %}
+
 ### Push Stories Analytics
 
 ![pushstoriesanalytics][5]
@@ -48,7 +55,7 @@ Push Story Segmentation is now available! When you create a Campaign or Canvas,
 
 
 ###  I sent myself a Push Story on iOS but did not receive the notification - what happened?
-Apple has specific rules in place that will prevent certain types of notifications from being sent to a device based on a number of different factors - this includes evaluating the customers data plan, whether the app was forced-closed, notification size and/or the customers storage capacity.  As a result, sometimes no notification will be sent to your customers. These are limitations imposed by Apple that should be considered when designing your Push Story.
+Apple has specific rules in place that will prevent certain types of notifications from being sent to a device based on a number of different factors - this includes evaluating the customers data plan, notification size and/or the customers storage capacity.  As a result, sometimes no notification will be sent to your customers. These are limitations imposed by Apple that should be considered when designing your Push Story.
 
 
 ### I sent myself a Push Story on iOS but saw the condensed view instead - what happened?
diff --git a/_docs/_user_guide/message_building_by_channel/push/users_and_subscriptions.md b/_docs/_user_guide/message_building_by_channel/push/users_and_subscriptions.md
new file mode 100644
index 0000000000..88e72745f1
--- /dev/null
+++ b/_docs/_user_guide/message_building_by_channel/push/users_and_subscriptions.md
@@ -0,0 +1,84 @@
+---
+nav_title: Subscription States
+platform: Message_Building_and_Personalization
+subplatform: Push
+page_order: 2
+---
+
+# Push Subscription States
+
+Push subscription states are filters that allow your users to control whether they receive messages or not. For your user to receive your messages through push, they must be `Subscribed` or `Opted-In`, as well as [Push Enabled](#push-enabled).
+
+![opt-in][56]{: height="50%" width="50%"}
+
+
+|Opt-in State|Description|
+|---|---|
+|Subscribed| Default status.|
+|Opted-In| A user has explicitly allowed Braze will automatically move a user's opt-in state to “Opted-In”. |
+|Unsubscribed| A user has explicitly disallowed push notifications.|
+
+Braze determines these states with __push tokens__, which can grant permission to send push notifications to your user - this is called ["Push Enabled"](#push-enabled).
+
+Individual user profiles can be exported in the JSON format using the users/export/ endpoints using Braze’s Rest API. Braze will return a push tokens object, that contains push enablement information per device, as well as an additional `notifications_enabled` parameter that will signify if a user blocked notifications from displaying (the [previous Android SDK](#before-android-sdk) version does not have the `notifications_enabled` parameter).
+
+{% alert note %}
+  __Bounces__
+
+  Occasionally, a push message will bounce (not be received by a user). This can happen because a user has either uninstalled the app, or because iOS or Android has changed the push token, as they have a right to do.
+{% endalert %}
+
+## Push Enabled
+
+A user is "Push Enabled" or "Push Registered" if they have an *active push token* for an app in your app group.
+
+On the User Engagement tab in the dashboard you will see: **Push Registered For** followed by an **App Name(s)** or followed by **No Apps**. There will be an entry for every device that belongs to the user.
+
+![img][1]{: height="50%" width="50%"}
+
+If the device entry's app name is prefixed by `Foreground:`, the app is authorized to receive both foreground push notifications (visible to the user) and background push notifications (not visible to the user) on that device.
+
+On the other hand, if the device entry's app name is prefixed by `Background:`, the app is only authorized to receive background push and can not display user-visible notifications on that device. This usually indicates the user has disabled notifications for the app on that device.
+
+If a push token is moved a different user on the same device, that first user will no longer be push registered.
+
+![img2][2]{: height="50%" width="50%"}
+
+# iOS & Android Details
+
+{% tabs %}
+  {% tab iOS %}
+__iOS Push__
+
+Your users _must explicitly opt-in to receive your push messages_. You must request whether the user would like to receive push from you.
+
+If your user allows push, you will receive a token and be able to send remote notifications to that user that appear in the foreground. If your user does not allow push notifications, you will still receive a token, but this token will only be able to send silent push which permits the app to carry out actions in the background (you must have "Remote Notifications" enabled in __Xcode__).
+
+iOS users are considered "Push Enabled" only if they have allowed notifications in the foreground.
+
+  {% endtab %}
+  {% tab Android %}
+__Android Push__
+
+You do not need to request permission to send push notifications to Android users. As the user has not explicitly requested to receive push, Braze will not automatically [update the user's opt-in state]({{ site.baseurl }}/developer_guide/rest_api/user_data/#braze-user-profile-fields). Upon a user’s first session on Android, Braze will automatically request for a new token and upon successfully receiving update the user’s push enabled state.
+
+If the user disables push, Braze will mark them as foreground push disabled no longer attempt to send them push messages. The filter `Push Enabled` will result in `false` for this user. You may continue to send background (silent) push notifications with the segmenting filter `Background Push Enabled = true`.
+
+On Android, Braze will move a user to be __push disabled__ if:
+- A user uninstalls the app from their device.
+- Braze receives a bounce when sending to a specific token (sometimes caused by app updates, uninstalls, new push token version or format).
+- Push registration fails to GCM/Firebase (sometimes caused by poor network connections or a failure to connect to or on GCM to return a valid token).
+- (For Android SDK v2.2.2+) The user blocks push notifications for the app within their device settings and subsequently log a session.
+
+  {% endtab %}
+{% endtabs %}
+
+## Before Android SDK v2.2.2 {#before-android-sdk}
+
+Here are some details you should know if you aren't using our most up to date Android SDK.
+- The previous version of the Android SDK does not detect that a user has disabled push and so the user's push enabled state remains enabled. When you attempt to send to a device in this state the push is 'sent' and the device receives the payload but is suppressed by the device so is not displayed to a user. Braze refers to this as ‘silently failing’.
+- The previous version of the Android SDK does not have the `notifications_enabled` parameter and will not return a value for it if user data is called using the Braze REST API.
+
+[1]: https://cloud.githubusercontent.com/assets/20304883/25244744/cd16d324-25b6-11e7-9d7c-d37b74690cf8.png
+[2]: https://cloud.githubusercontent.com/assets/20304883/25244775/ec6e0ae4-25b6-11e7-846d-4bf8f38c3057.png
+[56]: {% image_buster /assets/img_archive/braze_optedin.png %}
diff --git a/_docs/_user_guide/onboarding_with_braze/email_setup/overview_and_requirements.md b/_docs/_user_guide/onboarding_with_braze/email_setup/overview_and_requirements.md
index 670ff0f967..994f513bb9 100644
--- a/_docs/_user_guide/onboarding_with_braze/email_setup/overview_and_requirements.md
+++ b/_docs/_user_guide/onboarding_with_braze/email_setup/overview_and_requirements.md
@@ -15,7 +15,7 @@ Before you start sending emails, there are some things you need. Refer to the ba
 |---|---|---|
 | A Dedicated IP (Internet Protocol)| A dedicated IP is a unique Internet address provided exclusively to a single hosting account. | Braze gives its customers dedicated IPs, to ensure control of your email sender reputation. We will set this up for you.|
 | Whitelabeled Domains | These consist of a domain and a subdomain. Whitelabling ensures you pass email authentication checks for DKIM and SPF. | We will generate these domains for you, but you must choose their names. |
-|Subdomains | This is a subdivision of a domain and typically looks like: `@news.company.com` within your email address. Having a subdomain will prevent your any errors that could damage your company's official email reputation. | We will generate this for you, but you must decide the name of the subdomain. You cannot use subdomains that are currently being used outside of Braze. |
+|Subdomains | This is a subdivision of a domain and typically looks like: `@news.company.com` within your email address. Having a subdomain will prevent any errors that could damage your company's official email reputation. | We will generate this for you, but you must decide the name of the subdomain. You cannot use subdomains that are currently being used outside of Braze. |
 |IP Pools | These are an optional configuration used to separate out the reputation of different types of email (for example: "promotional" vs. "transactional") to prevent the reputation of one from impacting the other and ensure higher deliverability. | We will set up the pools for you; then, when composing your email, choose your email's IP pool from the IP Pool dropdown on the Target Users page.|
 
 ## IP Warming
diff --git a/_docs/_user_guide/personalization_and_dynamic_content/connected_content/aborting_connected_content.md b/_docs/_user_guide/personalization_and_dynamic_content/connected_content/aborting_connected_content.md
index 7631c2fe7f..5f794d8727 100644
--- a/_docs/_user_guide/personalization_and_dynamic_content/connected_content/aborting_connected_content.md
+++ b/_docs/_user_guide/personalization_and_dynamic_content/connected_content/aborting_connected_content.md
@@ -5,9 +5,10 @@ subplatform: Personalization
 page_order: 3
 ---
 # Aborting Messages {#aborting-connected-content}
-Using Liquid templating, you have the option to abort messages within conditionals. For example:
+Using Liquid templating, you have the option to abort messages with conditionals. For example:
 
 {% raw %}
+
 ```
 {% connected_content https://example.com/webservice.json :save connected %}
    {% if connected.recommendations.size < 5 or connected.foo.bar == nil %}
@@ -15,68 +16,13 @@ Using Liquid templating, you have the option to abort messages within conditiona
    {% endif %}
 ```
 
-You can also specify an abort reason, which will be saved to the Message Activity Log in your Developer Console:
+In the example above, the conditionals `connected.recommendations.size < 5` and `connected.foo.bar == nil` specify situations that would cause the message to be aborted. 
+
+You can also specify an abort reason, which will be saved to the __Message Activity Log__ in your __Developer Console__:
 
 `{% abort_message('Could not get enough recommendations') %}`
 {% endraw %}
 
->  Braze does not count Aborted Messages towards the send count in your Dashboard or in Currents.
-
-[1]: #aborting-connected-content
-[6]: {% image_buster /assets/img_archive/Connected_Content_Syntax.png %} "Connected Content Syntax Usage Example"
-[7]: http://openweathermap.org/api
-[8]: http://developer.nytimes.com/docs/read/article_search_api_v2
-[9]: http://open-platform.theguardian.com/documentation/
-[10]: http://alchemyapi.readme.io/v1.0/docs/introduction
-[11]: http://platform.seatgeek.com/
-[12]: http://developer.tmsapi.com/docs/read/data_v1_1/movies/movie_showtimes
-[13]: http://www.bandsintown.com/api/overview
-[14]: http://www.last.fm/api
-[15]: http://developer.ebay.com/devzone/shopping/docs/concepts/shoppingapiguide.html
-[16]: [success@braze.com](mailto:success@braze.com)
-[17]: {% image_buster /assets/img_archive/connected_weather_push2.png %} "Connected Content Push Usage Example"
-[18]: http://numbersapi.com/
-[19]: http://developer.eventbrite.com/
-[20]: http://api.eventful.com/
-[21]: http://www.discogs.com/developers/
-[22]: http://www.songkick.com/developer
-[23]: http://www.enclout.com/api/v1/yahoo_finance
-[24]: http://www.apple.com/itunes/affiliates/resources/documentation/itunes-store-web-service-search-api.html
-[25]: http://www.semantics3.com/products/pull
-[26]: http://factual.com/products/cpg
-[27]: http://blog.clearbit.com/logo
-[28]: http://api.tfl.gov.uk/#Line
-[29]: http://datamine.mta.info/
-[30]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/connected_content/about_connected_content/
-[31]: https://docs.transifex.com/api/translation-strings
-[32]: {% image_buster /assets/img_archive/TransifexUI.png %}
-[33]: {% image_buster /assets/img_archive/terminal.png %}
-[34]: {% image_buster /assets/img_archive/basic_auth_mgmt.png %}
-[35]: {% image_buster /assets/img_archive/basic_auth_token.png %}
-[36]: https://www.barchartondemand.com/free
-[37]: https://www.coindesk.com/api/
-[38]: http://developer.ticketmaster.com/products-and-docs/apis/getting-started/
-[39]: https://sunrise-sunset.org/api
-[40]: http://www.brewerydb.com/
-[41]: https://developers.zomato.com/api
-[42]: https://airvisual.com/api
-[43]: https://developer.nutritionix.com/
-[44]: https://open.fda.gov/api/
-[45]: https://ndb.nal.usda.gov/ndb/doc/index
-[46]: http://www.json.org
-[47]: {{ site.baseurl }}/user_guide/engagement_tools/campaigns/testing_and_more/rate-limiting/#delivery-speed-rate-limiting
-[48]: https://developer.accuweather.com/accuweather-locations-api/apis
-[49]: https://developer.accuweather.com/accuweather-forecast-api/apis
-[50]: https://developer.accuweather.com/accuweather-current-conditions-api/apis
-[51]: https://developer.accuweather.com/accuweather-indices-api/apis
-[52]: https://developer.accuweather.com/accuweather-weather-alarms-api/apis
-[53]: https://developer.accuweather.com/accuweather-alerts-api/apis
-[54]: https://developer.accuweather.com/accuweather-imagery-api/apis
-[55]: https://developer.accuweather.com/accuweather-tropical-api/apis
-[56]: https://developer.accuweather.com/accuweather-translations-api/apis
-[57]: https://developer.accuweather.com
-[58]: https://developer.accuweather.com/user/me/apps
-[59]: https://developer.accuweather.com/weather-alarm-thresholds
-[60]: {% image_buster /assets/img_archive/Accuweather_APIKey2.png %}
-[61]: https://developer.accuweather.com/weather-icons
-[62]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/connected_content/about_connected_content/
+{% alert important %}
+Braze does not count Aborted Messages towards the send count in your Braze account or in Currents.
+{% endalert %}
diff --git a/_docs/_user_guide/personalization_and_dynamic_content/liquid/filters.md b/_docs/_user_guide/personalization_and_dynamic_content/liquid/filters.md
index ee39c5adc5..17d299fbe4 100644
--- a/_docs/_user_guide/personalization_and_dynamic_content/liquid/filters.md
+++ b/_docs/_user_guide/personalization_and_dynamic_content/liquid/filters.md
@@ -52,6 +52,20 @@ You must first define one of the custom attributes as a variable and then perfor
 
 - [Full Math Filter Documentation from Shopify][19]
 
+## E-Commerce
+
+If you're updating a user on their purchase, an account balance, or anything regarding money, you can use [money filters][11] to ensure that your decimals are in the proper place and that no piece of your update is lost (like that pesky `0` at the end). See the example below:
+
+```liquid
+${{custom_attribute.${account_balance}  | money}}
+```
+
+As you can see, there are risks associated with leaving these money filters out.
+
+| With the Money Filter | Without the Money Filter |
+|---|---|
+|![With Filter][1] | ![Without Filter][2] |
+
 ## String Filters
 
 String filters are used to manipulate the outputs and variables of strings. For example, you can [capitalize][21] a string.
@@ -114,46 +128,17 @@ Which will return something like:
 
 - [Full Date Filter Documentation from Shopify][24]
 
-[1]: http://docs.shopify.com/themes/liquid-documentation/basics
-[2]: {{ site.baseurl }}/user_guide/data_and_analytics/custom_data/custom_attributes/
-[3]: http://docs.shopify.com/themes/liquid-documentation/filters
-[5]: {{ site.baseurl }}/user_guide/data_and_analytics/custom_data/custom_attributes/#custom-attribute-data-types
-[6]: #conditional-messaging-logic-tags
-[7]: https://docs.shopify.com/themes/liquid-documentation/tags
+[1]: {% image_buster /assets/img/with_money_filter.png %}
+[2]: {% image_buster /assets/img/without_money_filter.png %}
+[11]: https://help.shopify.com/en/themes/liquid/filters/money-filters
 [12]: https://docs.shopify.com/themes/liquid-documentation/filters
-[4]: {% image_buster /assets/img_archive/personalized_firstname_.png %}
-[8]: http://docs.shopify.com/themes/liquid-documentation/tags/control-flow-tags "Control Flow Tags"
-[9]: #connected-content
-[11]: {{ site.baseurl }}/user_guide/data_and_analytics/custom_data/custom_events/
-[13]: {% image_buster /assets/img_archive/total_revenue_ios.png %}
-[14]: {% image_buster /assets/img_archive/games_liquid.png %}
-[15]: {% image_buster /assets/img_archive/liquid_abort.png %}
-[16]: #manipulating-message-content-filters
-[17]: #conditional-logic
-[18]: #aborting-messages
 [19]: https://docs.shopify.com/themes/liquid/filters/math-filters
 [20]: https://docs.shopify.com/themes/liquid/filters/string-filters
 [21]: https://docs.shopify.com/themes/liquid/filters/string-filters#capitalize
 [22]: https://docs.shopify.com/themes/liquid/filters/array-filters
 [23]: https://docs.shopify.com/themes/liquid/filters/array-filters#first
 [24]: https://docs.shopify.com/themes/liquid/filters/additional-filters#date
-[25]: https://docs.shopify.com/themes/liquid/basics/operators
 [26]: {% image_buster /assets/img_archive/developer_console.png %}
 [27]: #adding-personalizable-attributes-objects
 [29]: {% image_buster /assets/img_archive/MemberSince.png %}
 [30]: #variable-tags
-[31]:https://docs.shopify.com/themes/liquid/tags/variable-tags
-[32]:https://docs.shopify.com/themes/liquid/tags/iteration-tags
-[33]:{% image_buster /assets/img_archive/SupportedAttributes.png %}
-[34]:{% image_buster /assets/img_archive/personalized_iflogic_.png %}
-[36]:{% image_buster /assets/img_archive/value_null.png %}
-[37]:#accounting-for-null-attribute-values
-[38]: {{ site.baseurl }}/user_guide/personalization_and_dynamic_content/connected_content/about_connected_content/
-[39]: #most-recently-used-device-information
-[40]: {{ site.baseurl }}/developer_guide/platform_integration_guides/ios/initial_sdk_setup/#optional-idfa-collection
-[41]: https://dashboard-01.braze.com/app_settings/app_settings/custom_attributes
-[42]: https://dashboard-01.braze.com/app_settings/app_settings/custom_events
-[43]: {{ site.baseurl }}/user_guide/message_building_by_channel/email/managing_user_subscriptions/#managing-user-subscriptions
-[44]: {% image_buster /assets/img_archive/insert_liquid_var_arrow.png %}
-[45]: {% image_buster /assets/img_archive/insert_var_shot.png %}
-[46]: #targeted-device-information
diff --git a/_docs/_user_guide/personalization_and_dynamic_content/liquid/overview.md b/_docs/_user_guide/personalization_and_dynamic_content/liquid/overview.md
index 5913bd402c..497ebb8832 100644
--- a/_docs/_user_guide/personalization_and_dynamic_content/liquid/overview.md
+++ b/_docs/_user_guide/personalization_and_dynamic_content/liquid/overview.md
@@ -35,7 +35,7 @@ Braze does not currently support 100% of Shopify's Liquid, only certain portions
 | Object | A denotation of a variable and location of intended variable name that tells Liquid where to show content in the message. | `{{${first_name}}}` will insert a user's first name into a message. |
 | Conditional Logic Tag | Tags create logic and control the flow for templates. In Braze's case, Conditional Logic Tags are Liquid used to consider intelligent or programming logic to create exceptions and variations in messages based on certain, predefined criteria. | ```{% if ${language} == 'en' %}``` will trigger your message in a designated way in the event that a user has designated "English" as their language. |
 | Filters | Used to change, narrow, or reformat the output of the Liquid Object. It is often used to create mathematical operations. |  ```{{"Big Sale" | upcase}}``` will cause the words "Big Sale" to appear as "BIG SALE" in the message. |
-| Operators | Used in messages to create dependencies or criteria that can affect which message your user receives. | Is a user meets the defined criteria in a messaged tagged with `{% customer_attribute.${Total_Revenue} > 0%}`, they will receive the message. If not, they will receive another designated message (or not), depending on what you set. |
+| Operators | Used in messages to create dependencies or criteria that can affect which message your user receives. | Is a user meets the defined criteria in a messaged tagged with `{% custom_attribute.${Total_Revenue} > 0%}`, they will receive the message. If not, they will receive another designated message (or not), depending on what you set. |
 
 {% endraw %}
 
diff --git a/_includes/analytics.html b/_includes/analytics.html
index 21cc1e273c..d05c653eab 100644
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -7,8 +7,7 @@
 {% comment %} End Google Tag Manager {% endcomment %}
 
 <script type="text/javascript">
-  +function(a,p,P,b,y){appboy={};appboyQueue=[];for(var s="initialize destroy getDeviceId toggleAppboyLogging setLogger openSession changeUser requestImmediateDataFlush requestFeedRefresh subscribeToFeedUpdates requestContentCardsRefresh subscribeToContentCardsUpdates logCardImpressions logCardClick logCardDismissal logFeedDisplayed logContentCardsDisplayed logInAppMessageImpression logInAppMessageClick logInAppMessageButtonClick logInAppMessageHtmlClick subscribeToNewInAppMessages removeSubscription removeAllSubscriptions logCustomEvent logPurchase isPushSupported isPushBlocked isPushGranted isPushPermissionGranted registerAppboyPushMessages unregisterAppboyPushMessages submitFeedback trackLocation stopWebTracking resumeWebTracking wipeData ab ab.User ab.User.Genders ab.User.NotificationSubscriptionTypes ab.User.prototype.getUserId ab.User.prototype.setFirstName ab.User.prototype.setLastName ab.User.prototype.setEmail ab.User.prototype.setGender ab.User.prototype.setDateOfBirth ab.User.prototype.setCountry ab.User.prototype.setHomeCity ab.User.prototype.setLanguage ab.User.prototype.setEmailNotificationSubscriptionType ab.User.prototype.setPushNotificationSubscriptionType ab.User.prototype.setPhoneNumber ab.User.prototype.setAvatarImageUrl ab.User.prototype.setLastKnownLocation ab.User.prototype.setUserAttribute ab.User.prototype.setCustomUserAttribute ab.User.prototype.addToCustomAttributeArray ab.User.prototype.removeFromCustomAttributeArray ab.User.prototype.incrementCustomUserAttribute ab.User.prototype.addAlias ab.User.prototype.setCustomLocationAttribute ab.InAppMessage ab.InAppMessage.SlideFrom ab.InAppMessage.ClickAction ab.InAppMessage.DismissType ab.InAppMessage.OpenTarget ab.InAppMessage.ImageStyle ab.InAppMessage.TextAlignment ab.InAppMessage.Orientation ab.InAppMessage.CropType ab.InAppMessage.prototype.subscribeToClickedEvent ab.InAppMessage.prototype.subscribeToDismissedEvent ab.InAppMessage.prototype.removeSubscription ab.InAppMessage.prototype.removeAllSubscriptions ab.InAppMessage.Button ab.InAppMessage.Button.prototype.subscribeToClickedEvent ab.InAppMessage.Button.prototype.removeSubscription ab.InAppMessage.Button.prototype.removeAllSubscriptions ab.SlideUpMessage ab.ModalMessage ab.FullScreenMessage ab.HtmlMessage ab.ControlMessage ab.Feed ab.Feed.prototype.getUnreadCardCount ab.ContentCards ab.ContentCards.prototype.getUnviewedCardCount ab.Card ab.ClassicCard ab.CaptionedImage ab.Banner ab.ControlCard ab.WindowUtils display display.automaticallyShowNewInAppMessages display.showInAppMessage display.showFeed display.destroyFeed display.toggleFeed display.showContentCards display.hideContentCards display.toggleContentCards sharedLib".split(" "),i=0;i<s.length;i++){for(var m=s[i],k=appboy,l=m.split("."),j=0;j<l.length-1;j++)k=k[l[j]];k[l[j]]=(new Function("return function "+m.replace(/\./g,"_")+"(){appboyQueue.push(arguments); return true}"))()}appboy.getUser=function(){return new appboy.ab.User};appboy.getCachedFeed=function(){return new appboy.ab.Feed};appboy.getCachedContentCards=function(){return new appboy.ab.ContentCards};(y=p.createElement(P)).type='text/javascript';y.src='https://js.appboycdn.com/web-sdk/2.2/appboy.min.js';y.async=1;(b=p.getElementsByTagName(P)[0]).parentNode.insertBefore(y,b)}(window,document,'script');
-
+  +function(a,p,P,b,y){appboy={};appboyQueue=[];for(var s="initialize destroy getDeviceId toggleAppboyLogging setLogger openSession changeUser requestImmediateDataFlush requestFeedRefresh subscribeToFeedUpdates requestContentCardsRefresh subscribeToContentCardsUpdates logCardImpressions logCardClick logCardDismissal logFeedDisplayed logContentCardsDisplayed logInAppMessageImpression logInAppMessageClick logInAppMessageButtonClick logInAppMessageHtmlClick subscribeToNewInAppMessages removeSubscription removeAllSubscriptions logCustomEvent logPurchase isPushSupported isPushBlocked isPushGranted isPushPermissionGranted registerAppboyPushMessages unregisterAppboyPushMessages submitFeedback trackLocation stopWebTracking resumeWebTracking wipeData ab ab.DeviceProperties ab.User ab.User.Genders ab.User.NotificationSubscriptionTypes ab.User.prototype.getUserId ab.User.prototype.setFirstName ab.User.prototype.setLastName ab.User.prototype.setEmail ab.User.prototype.setGender ab.User.prototype.setDateOfBirth ab.User.prototype.setCountry ab.User.prototype.setHomeCity ab.User.prototype.setLanguage ab.User.prototype.setEmailNotificationSubscriptionType ab.User.prototype.setPushNotificationSubscriptionType ab.User.prototype.setPhoneNumber ab.User.prototype.setAvatarImageUrl ab.User.prototype.setLastKnownLocation ab.User.prototype.setUserAttribute ab.User.prototype.setCustomUserAttribute ab.User.prototype.addToCustomAttributeArray ab.User.prototype.removeFromCustomAttributeArray ab.User.prototype.incrementCustomUserAttribute ab.User.prototype.addAlias ab.User.prototype.setCustomLocationAttribute ab.InAppMessage ab.InAppMessage.SlideFrom ab.InAppMessage.ClickAction ab.InAppMessage.DismissType ab.InAppMessage.OpenTarget ab.InAppMessage.ImageStyle ab.InAppMessage.TextAlignment ab.InAppMessage.Orientation ab.InAppMessage.CropType ab.InAppMessage.prototype.subscribeToClickedEvent ab.InAppMessage.prototype.subscribeToDismissedEvent ab.InAppMessage.prototype.removeSubscription ab.InAppMessage.prototype.removeAllSubscriptions ab.InAppMessage.Button ab.InAppMessage.Button.prototype.subscribeToClickedEvent ab.InAppMessage.Button.prototype.removeSubscription ab.InAppMessage.Button.prototype.removeAllSubscriptions ab.SlideUpMessage ab.ModalMessage ab.FullScreenMessage ab.HtmlMessage ab.ControlMessage ab.Feed ab.Feed.prototype.getUnreadCardCount ab.ContentCards ab.ContentCards.prototype.getUnviewedCardCount ab.Card ab.ClassicCard ab.CaptionedImage ab.Banner ab.ControlCard ab.WindowUtils display display.automaticallyShowNewInAppMessages display.showInAppMessage display.showFeed display.destroyFeed display.toggleFeed display.showContentCards display.hideContentCards display.toggleContentCards sharedLib".split(" "),i=0;i<s.length;i++){for(var m=s[i],k=appboy,l=m.split("."),j=0;j<l.length-1;j++)k=k[l[j]];k[l[j]]=(new Function("return function "+m.replace(/\./g,"_")+"(){appboyQueue.push(arguments); return true}"))()}appboy.getUser=function(){return new appboy.ab.User};appboy.getCachedFeed=function(){return new appboy.ab.Feed};appboy.getCachedContentCards=function(){return new appboy.ab.ContentCards};(y=p.createElement(P)).type='text/javascript';y.src='https://js.appboycdn.com/web-sdk/2.3/appboy.min.js';y.async=1;(b=p.getElementsByTagName(P)[0]).parentNode.insertBefore(y,b)}(window,document,'script');
 
 appboy.initialize('{{ site.api_key }}', {
   enableLogging: false,
diff --git a/_includes/archive/apple/initial_setup.md b/_includes/archive/apple/initial_setup.md
index 9c395775b3..9f20b2802d 100644
--- a/_includes/archive/apple/initial_setup.md
+++ b/_includes/archive/apple/initial_setup.md
@@ -103,7 +103,7 @@ Be sure to initialize Braze in your application's main thread. Initializing asyn
 
 ### Step 5: Specify Your Custom Endpoint or Data Cluster
 
-If you are an EU-based client, have a custom endpoint or are on a specific [data cluster][apple_initial_setup_31], you will need to direct the SDK to use that endpoint for your integration to work correctly. EU clients should refer to this [documentation][apple_initial_setup_30] to implement their iOS integration.
+Your Braze representative should have already advised you of the [correct endpoint]({{ site.baseurl }}/user_guide/administrative/access_braze/sdk_endpoints/).]
 
 Starting with Braze iOS SDK v3.0.2, you can set a custom endpoint using the `Info.plist` file. Add the `Appboy` dictionary to your Info.plist file. Inside the `Appboy` dictionary, add the `Endpoint` string subentry and set the value to your custom endpoint url's authority (e.g. `sdk.iad-01.braze.com`, *not* `https://sdk.iad-01.braze.com`).
 
diff --git a/_includes/youtube.html b/_includes/youtube.html
index 544b4872f0..9f3703eb7d 100644
--- a/_includes/youtube.html
+++ b/_includes/youtube.html
@@ -1 +1 @@
-<iframe width="560" height="315" src="https://www.youtube.com/embed/{{ include.id }}" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen class="media_embed"></iframe>
+<iframe width="560" height="315" src="https://www.youtube.com/embed/{{ include.id }}" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen class="media_embed {{ include.align }}"></iframe>
diff --git a/_layouts/featured.html b/_layouts/featured.html
new file mode 100644
index 0000000000..075f870f6d
--- /dev/null
+++ b/_layouts/featured.html
@@ -0,0 +1,97 @@
+---
+layout: default
+
+---
+
+
+
+{%- comment -%} Assigned variables first by page, then by layout {%- endcomment -%}
+{%- assign hide_nav = page.hide_nav -%}
+
+
+{%- assign hide_bottom_nav = page.hide_bottom_nav -%}
+{%- assign hide_breadcrumb = page.hide_breadcrumb -%}
+{%- assign hide_feedback = page.hide_feedback -%}
+{%- unless hide_nav -%}
+{%- assign hide_nav = layout.hide_nav -%}
+{%- endunless -%}
+
+{%- unless hide_bottom_nav -%}
+{%- assign hide_bottom_nav = layout.hide_bottom_nav -%}
+{%- endunless -%}
+{%- unless hide_breadcrumb -%}
+{%- assign hide_breadcrumb = layout.hide_breadcrumb -%}
+{%- endunless -%}
+{%- unless hide_feedback -%}
+{%- assign hide_feedback = layout.hide_feedback -%}
+{%- endunless -%}
+
+
+
+{% unless hide_nav %}
+<!-- button id="sidebar_toggle" class="btn btn-info d-print-none" data-toggle="collapse" aria-expanded="true" href="#nav_bar" >
+   <i class="fas"></i>
+</button -->
+<div class="col-sm-12 col-md-3 col-lg-3 col-xl-2 d-print-none collapse d-md-block" id="nav_bar"  >
+  <div id="nav_col" class="  ">
+  {% include left_nav_menu.html  %}
+  </div>
+</div>
+{% endunless %}
+
+<div class="col d-print-block " id="main_content" >
+
+    <div id="dev-main">
+
+    {%- unless hide_breadcrumb -%}
+    <div id="breadcrumb">
+    </div>
+    {%- endunless -%}
+
+
+    <h1> {{ page.guide_top_header }} </h1>
+    <p>  {{ page.guide_top_text }} </p>
+
+
+
+    <h2 class="guide_featured_title"> {{ page.guide_featured_title }} </h2>
+    <div id="guide_featured_list">
+
+      {%- for menu_list in page.guide_featured_list  -%}
+        {%- if menu_list.link -%}
+        <a href="{{ menu_list.link }}">
+            {%- endif %}
+          <div id="{{ menu_list.name | handle }}" class="guide_item">
+            {%- if menu_list.fa_icon -%}
+            <i class="{{menu_list.fa_icon}}"></i>
+            {%- else -%}
+              {%- if menu_list.image -%}
+              <img src="{{site.baseurl}}{{ menu_list.image}} " />
+              {%- endif -%}
+            {%- endif -%}
+            <div class="menu_description">
+                {{ menu_list.name }}
+              </div>
+          </div>
+            {%- if menu_list.link -%}
+        </a>
+        {%- endif %}
+      {%- endfor -%}
+    </div>
+
+    {{ content }}
+
+  </div>
+
+    {%- unless hide_bottom_nav -%}
+    <div id="bottom_nav" >
+      {%- unless hide_feedback -%}
+      {% include feedback.html  %}
+      {%- endunless -%}
+      <!-- div class="gradient-line" ></div -->
+    </div>
+
+    {%- endunless -%}
+
+    {% include footer.html class="footer_dev" %}
+</div>
diff --git a/assets/css/_content.scss b/assets/css/_content.scss
index 4a3d3386bd..a62ae0a4d9 100644
--- a/assets/css/_content.scss
+++ b/assets/css/_content.scss
@@ -13,10 +13,11 @@
   }
   @media print {
     display: block !important;
-    strong, b {
-      font-weight: normal;
-      font-family: $braze-black;
-    }
+  }
+
+  strong, b {
+    font-weight: normal;
+    font-family: $braze-black;
   }
 
   .fa-external-link-alt {
@@ -174,12 +175,32 @@
         border-width: 1px;
         border-style: solid;
       }
-      .media_embed {
-        margin-bottom: 15px;
-        margin-right: 15px;
-        border: 1px solid $grey-ghost;
-        max-width: 100%;
+      iframe {
+        &.media_embed {
+          margin-bottom: 15px;
+          margin-right: 15px;
+          border: 1px solid $grey-ghost;
+          max-width: 100%;
+          @media (min-width: $window-xlarge-px) {
+            &.right {
+              margin-left: 45px;
+              margin-right: 0px;
+              margin-bottom: 30px;
+              max-width: 50%;
+              float: right;
+            }
+            &.left {
+              margin-left: 0px;
+              margin-right: 45px;
+              margin-bottom: 30px;
+              max-width: 50%;
+              float: left;
+            }
+          }
+        }
+
       }
+
       details {
         summary {
             display: list-item;
@@ -233,11 +254,6 @@
           color: $text-color;
         }
       }
-      td {
-        code {
-          word-break: normal;
-        }
-      }
   }
 
   h1, h2, h3, h4, h5, h6 {
@@ -412,7 +428,12 @@ table {
   td {
     border: 1px solid $grey-ghost !important;
     font-size: 14px;
-
+    @media (max-width: $window-large-px) {
+      word-break: break-word;
+      a {
+        word-break: initial;
+      }
+    }
   }
   >tbody>tr>td, >tbody>tr>th, >tfoot>tr>td, >tfoot>tr>th, >thead>tr>td, >thead>tr>th {
       padding: 10px;
diff --git a/assets/download_file/braze-user-import-template-csv.xlsx b/assets/download_file/braze-user-import-template-csv.xlsx
new file mode 100644
index 0000000000..271ba2f69d
Binary files /dev/null and b/assets/download_file/braze-user-import-template-csv.xlsx differ
diff --git a/assets/img/IAMExpiration.png b/assets/img/IAMExpiration.png
new file mode 100644
index 0000000000..3a3b2813aa
Binary files /dev/null and b/assets/img/IAMExpiration.png differ
diff --git a/assets/img/api_key_location.png b/assets/img/api_key_location.png
new file mode 100644
index 0000000000..fefaa69eda
Binary files /dev/null and b/assets/img/api_key_location.png differ
diff --git a/assets/img/archive-content-block.png b/assets/img/archive-content-block.png
new file mode 100644
index 0000000000..74ff170bc5
Binary files /dev/null and b/assets/img/archive-content-block.png differ
diff --git a/assets/img/auto2.png b/assets/img/auto2.png
new file mode 100644
index 0000000000..673ca82792
Binary files /dev/null and b/assets/img/auto2.png differ
diff --git a/assets/img/aws-events.png b/assets/img/aws-events.png
new file mode 100644
index 0000000000..3c092d81ff
Binary files /dev/null and b/assets/img/aws-events.png differ
diff --git a/assets/img/aws-properties.png b/assets/img/aws-properties.png
new file mode 100644
index 0000000000..dcc27d2791
Binary files /dev/null and b/assets/img/aws-properties.png differ
diff --git a/assets/img/campaign_export_example.png b/assets/img/campaign_export_example.png
new file mode 100644
index 0000000000..a866c7d3db
Binary files /dev/null and b/assets/img/campaign_export_example.png differ
diff --git a/assets/img/create_policy_1_list.png b/assets/img/create_policy_1_list.png
new file mode 100644
index 0000000000..eeae0d6623
Binary files /dev/null and b/assets/img/create_policy_1_list.png differ
diff --git a/assets/img/create_policy_3_name.png b/assets/img/create_policy_3_name.png
new file mode 100644
index 0000000000..d7d22a3851
Binary files /dev/null and b/assets/img/create_policy_3_name.png differ
diff --git a/assets/img/create_policy_4_created.png b/assets/img/create_policy_4_created.png
new file mode 100644
index 0000000000..5ce2133260
Binary files /dev/null and b/assets/img/create_policy_4_created.png differ
diff --git a/assets/img/create_role_1_list.png b/assets/img/create_role_1_list.png
new file mode 100644
index 0000000000..68f0c9df2a
Binary files /dev/null and b/assets/img/create_role_1_list.png differ
diff --git a/assets/img/create_role_2_another.png b/assets/img/create_role_2_another.png
new file mode 100644
index 0000000000..e7e7850d14
Binary files /dev/null and b/assets/img/create_role_2_another.png differ
diff --git a/assets/img/create_role_3_attach.png b/assets/img/create_role_3_attach.png
new file mode 100644
index 0000000000..abb76dd8d9
Binary files /dev/null and b/assets/img/create_role_3_attach.png differ
diff --git a/assets/img/create_role_4_name.png b/assets/img/create_role_4_name.png
new file mode 100644
index 0000000000..553e8c0783
Binary files /dev/null and b/assets/img/create_role_4_name.png differ
diff --git a/assets/img/create_role_5_created.png b/assets/img/create_role_5_created.png
new file mode 100644
index 0000000000..e6a7bce213
Binary files /dev/null and b/assets/img/create_role_5_created.png differ
diff --git a/assets/img/create_role_6_summary.png b/assets/img/create_role_6_summary.png
new file mode 100644
index 0000000000..f4ab9d4839
Binary files /dev/null and b/assets/img/create_role_6_summary.png differ
diff --git a/assets/img/currents-role-arn.png b/assets/img/currents-role-arn.png
new file mode 100644
index 0000000000..fcad8430a0
Binary files /dev/null and b/assets/img/currents-role-arn.png differ
diff --git a/assets/img/currents-s3-example.png b/assets/img/currents-s3-example.png
new file mode 100644
index 0000000000..d2352f3abf
Binary files /dev/null and b/assets/img/currents-s3-example.png differ
diff --git a/assets/img/data-export-role-arn.png b/assets/img/data-export-role-arn.png
new file mode 100644
index 0000000000..f20d8b2a5f
Binary files /dev/null and b/assets/img/data-export-role-arn.png differ
diff --git a/assets/img/email-msg-chn.png b/assets/img/email-msg-chn.png
new file mode 100644
index 0000000000..9e8ed66731
Binary files /dev/null and b/assets/img/email-msg-chn.png differ
diff --git a/assets/img/expires-after.png b/assets/img/expires-after.png
new file mode 100644
index 0000000000..4fe1ca1e11
Binary files /dev/null and b/assets/img/expires-after.png differ
diff --git a/assets/img/expires-by.png b/assets/img/expires-by.png
new file mode 100644
index 0000000000..ce9c04fd06
Binary files /dev/null and b/assets/img/expires-by.png differ
diff --git a/assets/img/full-screen-behavior.gif b/assets/img/full-screen-behavior.gif
new file mode 100644
index 0000000000..5d46f7c42f
Binary files /dev/null and b/assets/img/full-screen-behavior.gif differ
diff --git a/assets/img/full-screen-large-viewport.png b/assets/img/full-screen-large-viewport.png
new file mode 100644
index 0000000000..1620aa5a0e
Binary files /dev/null and b/assets/img/full-screen-large-viewport.png differ
diff --git a/assets/img/full-screen-spec.png b/assets/img/full-screen-spec.png
new file mode 100644
index 0000000000..e974f1f6f9
Binary files /dev/null and b/assets/img/full-screen-spec.png differ
diff --git a/assets/img/github/ccimg.png b/assets/img/github/ccimg.png
deleted file mode 100644
index 9026b62a7d..0000000000
Binary files a/assets/img/github/ccimg.png and /dev/null differ
diff --git a/assets/img/github/commit_new_file.png b/assets/img/github/commit_new_file.png
deleted file mode 100644
index 823471492a..0000000000
Binary files a/assets/img/github/commit_new_file.png and /dev/null differ
diff --git a/assets/img/github/name_file.png b/assets/img/github/name_file.png
deleted file mode 100644
index bea992cc39..0000000000
Binary files a/assets/img/github/name_file.png and /dev/null differ
diff --git a/assets/img/github/writing_docs.gif b/assets/img/github/writing_docs.gif
deleted file mode 100644
index 9f519ff15f..0000000000
Binary files a/assets/img/github/writing_docs.gif and /dev/null differ
diff --git a/assets/img/global_rules.png b/assets/img/global_rules.png
new file mode 100644
index 0000000000..f50e6ea43e
Binary files /dev/null and b/assets/img/global_rules.png differ
diff --git a/assets/img/iam-generations.gif b/assets/img/iam-generations.gif
new file mode 100644
index 0000000000..60ef39f50f
Binary files /dev/null and b/assets/img/iam-generations.gif differ
diff --git a/assets/img/iam-user-preview.png b/assets/img/iam-user-preview.png
new file mode 100644
index 0000000000..2589f7c073
Binary files /dev/null and b/assets/img/iam-user-preview.png differ
diff --git a/assets/img/iam_compose.gif b/assets/img/iam_compose.gif
new file mode 100644
index 0000000000..cef79f4e26
Binary files /dev/null and b/assets/img/iam_compose.gif differ
diff --git a/assets/img/iamlive.png b/assets/img/iamlive.png
new file mode 100644
index 0000000000..6f4996cab5
Binary files /dev/null and b/assets/img/iamlive.png differ
diff --git a/assets/img/iampush.png b/assets/img/iampush.png
new file mode 100644
index 0000000000..da86af16e2
Binary files /dev/null and b/assets/img/iampush.png differ
diff --git a/assets/img/icon_full_screen.png b/assets/img/icon_full_screen.png
new file mode 100644
index 0000000000..180c4c8d33
Binary files /dev/null and b/assets/img/icon_full_screen.png differ
diff --git a/assets/img/icon_modal.png b/assets/img/icon_modal.png
new file mode 100644
index 0000000000..d2a4c4d8a5
Binary files /dev/null and b/assets/img/icon_modal.png differ
diff --git a/assets/img/icon_slideup.png b/assets/img/icon_slideup.png
new file mode 100644
index 0000000000..50723a9c2c
Binary files /dev/null and b/assets/img/icon_slideup.png differ
diff --git a/assets/img/in-app-message-campaign-details.png b/assets/img/in-app-message-campaign-details.png
new file mode 100644
index 0000000000..66c543b154
Binary files /dev/null and b/assets/img/in-app-message-campaign-details.png differ
diff --git a/assets/img/in-app-message-canvas-reporting.png b/assets/img/in-app-message-canvas-reporting.png
new file mode 100644
index 0000000000..2a54e01823
Binary files /dev/null and b/assets/img/in-app-message-canvas-reporting.png differ
diff --git a/assets/img/in-app-message-historical-performance.png b/assets/img/in-app-message-historical-performance.png
new file mode 100644
index 0000000000..9cb936c80d
Binary files /dev/null and b/assets/img/in-app-message-historical-performance.png differ
diff --git a/assets/img/in-app-message-message-performance.png b/assets/img/in-app-message-message-performance.png
new file mode 100644
index 0000000000..c191c8d132
Binary files /dev/null and b/assets/img/in-app-message-message-performance.png differ
diff --git a/assets/img/in-app-message-preview.png b/assets/img/in-app-message-preview.png
new file mode 100644
index 0000000000..bf57c6a669
Binary files /dev/null and b/assets/img/in-app-message-preview.png differ
diff --git a/assets/img/in-app-msg-chn.png b/assets/img/in-app-msg-chn.png
new file mode 100644
index 0000000000..02657402e4
Binary files /dev/null and b/assets/img/in-app-msg-chn.png differ
diff --git a/assets/img/inkit-integration.png b/assets/img/inkit-integration.png
new file mode 100644
index 0000000000..887165f7a8
Binary files /dev/null and b/assets/img/inkit-integration.png differ
diff --git a/assets/img/inkit-use.png b/assets/img/inkit-use.png
new file mode 100644
index 0000000000..d358d5a432
Binary files /dev/null and b/assets/img/inkit-use.png differ
diff --git a/assets/img/inkit-webhook-template.png b/assets/img/inkit-webhook-template.png
new file mode 100644
index 0000000000..6d8418d648
Binary files /dev/null and b/assets/img/inkit-webhook-template.png differ
diff --git a/assets/img/modal-behavior.gif b/assets/img/modal-behavior.gif
new file mode 100644
index 0000000000..073225a24d
Binary files /dev/null and b/assets/img/modal-behavior.gif differ
diff --git a/assets/img/modal-large-viewport.png b/assets/img/modal-large-viewport.png
new file mode 100644
index 0000000000..4261e954ad
Binary files /dev/null and b/assets/img/modal-large-viewport.png differ
diff --git a/assets/img/modal-spec.png b/assets/img/modal-spec.png
new file mode 100644
index 0000000000..20468fa205
Binary files /dev/null and b/assets/img/modal-spec.png differ
diff --git a/assets/img/multicolor_android_push.png b/assets/img/multicolor_android_push.png
new file mode 100644
index 0000000000..f22ac88786
Binary files /dev/null and b/assets/img/multicolor_android_push.png differ
diff --git a/assets/img/optimal-send-time.png b/assets/img/optimal-send-time.png
new file mode 100644
index 0000000000..4b755a0fee
Binary files /dev/null and b/assets/img/optimal-send-time.png differ
diff --git a/assets/img/primary-secondary-buttons.png b/assets/img/primary-secondary-buttons.png
new file mode 100644
index 0000000000..82665abb6d
Binary files /dev/null and b/assets/img/primary-secondary-buttons.png differ
diff --git a/assets/img/s3_tech_partners.png b/assets/img/s3_tech_partners.png
index 7c414f0eff..deb04e0032 100644
Binary files a/assets/img/s3_tech_partners.png and b/assets/img/s3_tech_partners.png differ
diff --git a/assets/img/slideup-behavior.gif b/assets/img/slideup-behavior.gif
new file mode 100644
index 0000000000..050c4ed182
Binary files /dev/null and b/assets/img/slideup-behavior.gif differ
diff --git a/assets/img/slideup-large-viewport.png b/assets/img/slideup-large-viewport.png
new file mode 100644
index 0000000000..fa5cd71fb7
Binary files /dev/null and b/assets/img/slideup-large-viewport.png differ
diff --git a/assets/img/slideup-spec.png b/assets/img/slideup-spec.png
new file mode 100644
index 0000000000..f72bec2e08
Binary files /dev/null and b/assets/img/slideup-spec.png differ
diff --git a/assets/img/standard_rules_fnfn.png b/assets/img/standard_rules_fnfn.png
new file mode 100644
index 0000000000..c6e42a6407
Binary files /dev/null and b/assets/img/standard_rules_fnfn.png differ
diff --git a/assets/img/tag_rule_fnfn.png b/assets/img/tag_rule_fnfn.png
new file mode 100644
index 0000000000..4073006c85
Binary files /dev/null and b/assets/img/tag_rule_fnfn.png differ
diff --git a/assets/img/unarchive-content-block.png b/assets/img/unarchive-content-block.png
new file mode 100644
index 0000000000..f052ee903b
Binary files /dev/null and b/assets/img/unarchive-content-block.png differ
diff --git a/assets/img/video_iam.png b/assets/img/video_iam.png
new file mode 100644
index 0000000000..e2e854447c
Binary files /dev/null and b/assets/img/video_iam.png differ
diff --git a/assets/img/webhook-msg-chn.png b/assets/img/webhook-msg-chn.png
new file mode 100644
index 0000000000..54d53dd070
Binary files /dev/null and b/assets/img/webhook-msg-chn.png differ
diff --git a/assets/img/with_money_filter.png b/assets/img/with_money_filter.png
new file mode 100644
index 0000000000..6daecae451
Binary files /dev/null and b/assets/img/with_money_filter.png differ
diff --git a/assets/img/without_money_filter.png b/assets/img/without_money_filter.png
new file mode 100644
index 0000000000..9b1b79004c
Binary files /dev/null and b/assets/img/without_money_filter.png differ
diff --git a/assets/img_archive/stensul_save_options.png b/assets/img_archive/stensul_save_options.png
new file mode 100644
index 0000000000..bb6149dc61
Binary files /dev/null and b/assets/img_archive/stensul_save_options.png differ
diff --git a/assets/img_archive/stensul_upload_options.png b/assets/img_archive/stensul_upload_options.png
new file mode 100644
index 0000000000..1940db8dde
Binary files /dev/null and b/assets/img_archive/stensul_upload_options.png differ
diff --git a/assets/img_archive/stensul_upload_success.png b/assets/img_archive/stensul_upload_success.png
new file mode 100644
index 0000000000..7eb9b0a646
Binary files /dev/null and b/assets/img_archive/stensul_upload_success.png differ
diff --git a/assets/img_archive/stripo_export.png b/assets/img_archive/stripo_export.png
new file mode 100644
index 0000000000..063ec9536a
Binary files /dev/null and b/assets/img_archive/stripo_export.png differ
diff --git a/assets/img_archive/stripo_form.png b/assets/img_archive/stripo_form.png
new file mode 100644
index 0000000000..df34eb8ccf
Binary files /dev/null and b/assets/img_archive/stripo_form.png differ
diff --git a/assets/js/broken_redirect_list.js b/assets/js/broken_redirect_list.js
index 4e6d953be2..cb513a572a 100644
--- a/assets/js/broken_redirect_list.js
+++ b/assets/js/broken_redirect_list.js
@@ -1,3 +1,5 @@
 var validurls = (typeof validurls === "undefined")  ? {} : validurls;
 
 validurls['/docs/user_guide/data_and_analytics/engagement_reports/#engagement-reports'] = '/docs/user_guide/data_and_analytics/your_reports/engagement_reports/#engagement-reports';
+validurls['/docs/SDK_Changelogs'] = '/docs/developer_guide/platform_integration_guides/sdk_changelogs/#sdk-changelogs';
+validurls['/docs/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3_for_currents'] = '/docs/partners/technology_partners/data_and_infrastructure_agility/data_warehouses/amazon_s3/';
diff --git a/assets/js/documents.js b/assets/js/documents.js
index aa057cc12c..12722902b0 100644
--- a/assets/js/documents.js
+++ b/assets/js/documents.js
@@ -2,6 +2,16 @@
 
 var query_str = window.location.search;
 $(document).ready(function() {
+
+  function string_to_slug(str) {
+    if (str) {
+      str = str.toLowerCase().replace(/\s/g, '-').replace(/[^\w-]/g, '');
+    }
+    return str;
+  }
+
+
+
   $('#toc').toc({
     headers: 'h1, h2, h3',
     minimumHeaders: toc_minheaders
@@ -103,6 +113,17 @@ $(document).ready(function() {
   scrollHandler();
   $(window).scroll(scrollHandler);
 
+  // see if a details tag should be auto-opened
+  var details_list = $('details');
+  var url_hash = window.location.hash.replace('#','')
+  details_list.each(function(k,v) {
+    var $this = $(this);
+    if (url_hash == string_to_slug($this.find('summary')[0].innerText)) {
+      $this.attr('open',true);
+    }
+  });
+
+
   // Footer navigation
   var parent_top = 'nav_top';
 
@@ -182,11 +203,7 @@ $(document).ready(function() {
   $('.ab-tab-content .ab-tab-pane:first-child').addClass('active')
 
 
-  function string_to_slug (str) {
-    str = str.toLowerCase().replace(/\s/g, '-').replace(/[^\w-]/g, '');
 
-    return str;
-  }
   String.prototype.upCaseWord = function() {
     return this.toString().replace(/\b\w/g, function(l){ return l.toUpperCase() });
   };
@@ -323,5 +340,9 @@ $(document).ready(function() {
      }
      return tofilter
   }).after(' <i class="fas fa-external-link-alt"></i>')
-
+  $('.highlight .highlight .rouge-code pre').each(function(k) {
+    if ($(this).html().length > 120) {
+      $(this).css('min-height','36px');
+    }
+  });
 });
diff --git a/assets/js/swagger/braze_swagger.json b/assets/js/swagger/braze_swagger.json
index 4af7266a90..50e51cbe48 100644
--- a/assets/js/swagger/braze_swagger.json
+++ b/assets/js/swagger/braze_swagger.json
@@ -1706,7 +1706,7 @@
         }
       }
     },
-    "/subscription/user": {
+    "/subscription/user/status": {
       "get": {
         "tags": [
           "Subscription Groups"
@@ -1742,7 +1742,7 @@
             "example": "external_user_id"
           },
           {
-            "name": "email_address",
+            "name": "email",
             "in": "query",
             "description": "The email address of the user; must include at least one address and at most 50 addresses.",
             "required": true,
@@ -1827,7 +1827,7 @@
           {
             "name": "external_id",
             "in": "query",
-            "description": "The External Id (`external_id`) of the user. Either the user's `external_id` or the `email_address` is required.",
+            "description": "The External Id (`external_id`) of the user. Either the user's `external_id` or the `email` is required.",
             "required": false,
             "style": "form",
             "explode": true,
@@ -1838,9 +1838,9 @@
             "example": "external_user_id"
           },
           {
-            "name": "email_address",
+            "name": "email",
             "in": "query",
-            "description": "The email address of the user; must include at least one address and at most 100 addresses. Either the user's `external_id` or the `email_address` is required.",
+            "description": "The email address of the user; must include at least one address and at most 100 addresses. Either the user's `external_id` or the `email` is required.",
             "required": false,
             "style": "form",
             "explode": true,
@@ -1854,7 +1854,7 @@
             "name": "subscription_group_id",
             "in": "query",
             "description": "The ID of your Subscription Group. Copied from the Subscription Groups page of your Braze account.",
-            "required": false,
+            "required": true,
             "style": "form",
             "explode": true,
             "schema": {
@@ -1894,9 +1894,9 @@
         "requestBody": {
           "api_key": "123a45b6-cd78-9e01-g234-hi56j7k8l9m0",
           "subscription_group_id": "pto81fff-734f-80e5-b7b2-b880562888ww",
-          "subscription_group_state": "unsubscribed",
+          "subscription_state": "unsubscribed",
           "external_id": "external_user_id",
-          "email_address": "your.user@email.com",
+          "email": "your.user@email.com",
         "description": "Use the following request body below to set user subscruption statuses. Be sure to adhere to the defined parameters outlined in the Modal tab.",
           "required": true,
           "content": {
@@ -2853,9 +2853,9 @@
       "required": [
         "api_key",
         "subscription_group_id",
-        "subscription_group_state",
+        "subscription_state",
         "external_id",
-        "email_address"
+        "email"
       ],
       "properties": {
         "api_key": {
@@ -2870,20 +2870,20 @@
           "description": "The ID of your Subscription Group. Copied from the Subscription Groups page of your Braze account.",
           "example": "pto81fff-734f-80e5-b7b2-b880562888ww"
         },
-        "subscription_group_state": {
+        "subscription_state": {
           "type": "string",
           "format": "int64",
           "description": "Choose from available values: `unsubscribed` (not in subscription group) or `subscribed` (in subscription group).",
           "example": "unsubscribed"
         },
-        "external_ids": {
+        "external_id": {
           "type": "string",
-          "description": "The External Id (`external_id`) of the user. Either the user's `external_id` or the `email_address` is required.",
+          "description": "The External Id (`external_id`) of the user. Either the user's `external_id` or the `email` is required.",
           "example": "user123"
         },
-        "email_address": {
+        "email": {
           "type": "string",
-          "description": "The email address of the user; must include at least one address and at most 100 addresses. Either the user's `external_id` or the `email_address` is required.",
+          "description": "The email address of the user; must include at least one address and at most 100 addresses. Either the user's `external_id` or the `email` is required.",
           "example": "your.user@email.com"
         }
       }
@@ -2900,7 +2900,7 @@
           "format": "int64",
           "example": "123a45b6-cd78-9e01-g234-hi56j7k8l9m0"
         },
-        "external_ids": {
+        "external_id": {
           "type": "array",
           "items": {
             "type": "string",
@@ -3005,7 +3005,7 @@
           "format": "int64",
           "example": "123a45b6-cd78-9e01-g234-hi56j7k8l9m0"
         },
-        "external_ids": {
+        "external_id": {
           "type": "array",
           "items": {
             "type": "string",
diff --git a/assets/js/toc.js b/assets/js/toc.js
index 969149cbfc..2a8c968e16 100644
--- a/assets/js/toc.js
+++ b/assets/js/toc.js
@@ -31,6 +31,9 @@
       if (!this.id && previousSiblingName) {
         this.id = $(this).attr( "id", previousSiblingName.replace(/\./g, "-") );
       }
+      if ($(this).html().length == 0) {
+        return false;
+      }
       return this.id;
     }), output = $(this);
     if (!headers.length || headers.length < settings.minimumHeaders || !output.length) {
diff --git a/assets/pdf/IAM_Gen_Diff.xlsx b/assets/pdf/IAM_Gen_Diff.xlsx
new file mode 100644
index 0000000000..39b623881d
Binary files /dev/null and b/assets/pdf/IAM_Gen_Diff.xlsx differ
diff --git a/readme.md b/readme.md
index ae3fec94d0..5f067bf575 100644
--- a/readme.md
+++ b/readme.md
@@ -1,43 +1,80 @@
-# Welcome to Braze Docs!
+# Success!!
 
-This is where you can contribute to the [Braze Documentation site](www.braze.com/docs).
+This repository houses the content on Braze's [Docs](https://braze.com/docs/), the [User Guide](https://braze.com/docs/user_guide/), and the [Developer Guide](https://braze.com/docs/developer_guide/).
 
-## What You Need to Know
+## Initial Setup
+For friends in Success, Product, and Marketing, please find the necessary steps [here](https://github.com/Appboy/success/wiki/Setting-up-your-local-environment).
 
-- This is a [Jekyll](https://github.com/Appboy/braze-docs/wiki/Jekyll-Overview) site.
-- This branch is merged to our master branch and the production site at least weekly on Tuesdays.
+For friends in Engineering (or anyone using rbenv) - if you are having problems related to ruby versions (i.e. `ruby -v`  tells you that you are not on 2.2.4), try adding the following to your .bash_profile:
+```
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+```
 
-If you would like us to incorporate your changes into the official version of the document, you can submit changes to the Appboy/docs Github Repo and we will review the changes.  If we accept any such changes, they will be licensed to us under the CLA found at http://www.braze.com/docs/cla.
+## SITE UPDATE
+Documentation is currently being updated and redesigned.  If you're having trouble with the new site, and getting build error, try the following steps:
 
-## Table of Contents
-- [About Braze](#about-braze)
-- [Our CLA](#braze-cla)
-- [Braze Open Source License](#open-source-license)
-- [Before You Contribute](#before-you-contribute)
+* Assume basic Jekyll local installed already done, otherwise follow [Wiki instructions](https://github.com/Appboy/success/wiki/Setting-up-your-local-environment).
+* Optional: Upgrade rvm
+  * `rvm get stable`
+* Upgrade Ruby
+  * `rvm install ruby-2.5.1`
+* Have rvm using new Ruby
+  * `rvm use ruby-2.5.1`
+* Update Jekyll and Gems
+  * `gem install bundler`
+  * `bundle install`
 
+Afterwards, you should be able to do the normal Jekyll build or rake process.
 
-### About Braze
-[Braze Home Site](https://www.braze.com/)
+## Wiki
+For more information on this repository and making changes to the [User Guide](https://braze.com/docs/user_guide/) and the [Developer Guide](https://braze.com/docs/developer_guide/), please visit the wiki [here](https://github.com/Appboy/success/wiki).
 
-[Braze Legal Information](https://www.braze.com/legal)
+## Heroku Setup (ignore unless your name is Sal)
+#### Git Config
+```
+git remote add staging https://git.heroku.com/ab-success.git
+git remote add production https://git.heroku.com/ab-success-production.git
+git remote add -t master -m master -f secure git@github.com:AppboySecure/success.git
+git checkout -b master -t secure/master
+git checkout develop
+```
+#### Ruby
+```
+brew update && brew upgrade ruby-build && brew upgrade rbenv-gemset;
+eval "$(rbenv init -)"
+rbenv install 2.2.4
+rbenv local 2.2.4
+gem install bundler -v 1.11.2
+rbenv rehash
+bundle install
+```
+### Heroku
+#### Logs
+##### Staging
+`heroku logs --remote staging`
+##### Production
+`heroku logs --remote production`
+#### Deploy
+##### Staging
+`git push staging develop:master`
+##### Production
+`git push production master:master`
 
-### Braze CLA
-Before you get started, Braze requires that a Braze Contributor License Agreement (CLA) be filled out by every contributor to the Braze Docs open source project.
+## Herokou Troubleshooting Pull Request
+To view logs for Heroku pull request, get access to ab-success on heroku, and follow heroku documentation to get the [CLI install](https://devcenter.heroku.com/articles/heroku-cli)
 
-Braze will not merge a pull request made against a Braze Docs open source project until that pull request is associated with a signed CLA. [Sign a CLA here](http://www.braze.com/docs/cla).
+### Custom git Pull Request Remote
+Add Custom Pull Request to remote (Replace testpr with desire remote name)
+```
+git remote add testpr https://git.heroku.com/ab-success-pr-[pullrequestnumber].git
+```
+Or rename existing remote with the Pull Request
+```
+git remote set-url testpr https://git.heroku.com/ab-success-pr-[pullrequestnumber].git
+```
 
-### Open Source License
-
-![Licence Icon](https://github.com/Appboy/braze-docs/blob/master/assets/img/github/ccimg.png) 
-
-Braze Documentation is licensed under the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/).
-
-### Before You Contribute
-1. Complete our [CLA](http://www.braze.com/docs/cla).
-2. Take the [Braze Docs Tour](www.braze.com/docs/tour).
-3. Check out [our Wiki](https://github.com/Appboy/braze-docs/wiki) - especially…
-  - the [Contributor Quick Start Guide](https://github.com/Appboy/braze-docs/wiki/Contributor-Quick-Start-Guide),
-  - [Set Up Your Local Environment](https://github.com/Appboy/braze-docs/wiki/Set-Up-Your-Local-Environment),
-  - [the Writing Style Guide](https://github.com/Appboy/braze-docs/wiki/Writing-Style-Guide-&-Best-Practices),  
-  - [the Markdown Formatting Style Guide](https://github.com/Appboy/braze-docs/wiki/Special-Formatting), and
-  - [the Media Style Guide](https://github.com/Appboy/braze-docs/wiki/Media-Formatting-Guide).
+### View Pull Request Log
+To pull the request log (or replace testpr with previous remote name)
+```
+heroku logs --remote testpr
+```