diff --git a/docs/alertios.md b/docs/alertios.md
index 519351cd368..2e63c6c4f37 100644
--- a/docs/alertios.md
+++ b/docs/alertios.md
@@ -1,9 +1,9 @@
 ---
 id: alertios
-title: AlertIOS
+title: 🚧 AlertIOS
 ---
 
-> **Deprecated.** `AlertIOS` has been moved to [`Alert`](alert.md)
+> **Deprecated.** Use [`Alert`](alert.md) instead.
 
 `AlertIOS` provides functionality to create an iOS alert dialog with a message or create a prompt for user input.
 
diff --git a/docs/asyncstorage.md b/docs/asyncstorage.md
index 01120c8d9b1..31d65b72b4d 100644
--- a/docs/asyncstorage.md
+++ b/docs/asyncstorage.md
@@ -1,9 +1,9 @@
 ---
 id: asyncstorage
-title: AsyncStorage
+title: 🚧 AsyncStorage
 ---
 
-> **Deprecated.** Use [react-native-community/react-native-async-storage](https://github.com/react-native-community/react-native-async-storage) instead.
+> **Deprecated.** Use [@react-native-community/async-storage](https://github.com/react-native-community/react-native-async-storage) instead.
 
 `AsyncStorage` is an unencrypted, asynchronous, persistent, key-value storage system that is global to the app. It should be used instead of LocalStorage.
 
diff --git a/docs/datepickerandroid.md b/docs/datepickerandroid.md
index e6b7f85d759..7ac9f79e622 100644
--- a/docs/datepickerandroid.md
+++ b/docs/datepickerandroid.md
@@ -1,11 +1,11 @@
 ---
 id: datepickerandroid
-title: DatePickerAndroid
+title: 🚧 DatePickerAndroid
 ---
 
-Opens the standard Android date picker dialog.
+> **Deprecated.** Use [@react-native-community/datetimepicker](https://github.com/react-native-community/react-native-datetimepicker) instead. 
 
-> `DatePickerAndroid` has been merged with `DatePickerIOS` and `TimePickerAndroid` into a single component called [DateTimePicker](https://github.com/react-native-community/react-native-datetimepicker#react-native-datetimepicker) and will be removed in a future release.
+Opens the standard Android date picker dialog.
 
 ### Example
 
diff --git a/docs/datepickerios.md b/docs/datepickerios.md
index 347ace70be0..7d046e72669 100644
--- a/docs/datepickerios.md
+++ b/docs/datepickerios.md
@@ -1,11 +1,11 @@
 ---
 id: datepickerios
-title: DatePickerIOS
+title: 🚧 DatePickerIOS
 ---
 
-Use `DatePickerIOS` to render a date/time picker (selector) on iOS. This is a controlled component, so you must hook in to the `onDateChange` callback and update the `date` prop in order for the component to update, otherwise the user's change will be reverted immediately to reflect `props.date` as the source of truth.
+> **Deprecated.** Use [@react-native-community/datetimepicker](https://github.com/react-native-community/react-native-datetimepicker) instead. 
 
-> `DatePickerIOS` has been merged with `TimePickerAndroid` and `DatePickerAndroid` into a single component called [DateTimePicker](https://github.com/react-native-community/react-native-datetimepicker#react-native-datetimepicker) and will be removed in a future release.
+Use `DatePickerIOS` to render a date/time picker (selector) on iOS. This is a controlled component, so you must hook in to the `onDateChange` callback and update the `date` prop in order for the component to update, otherwise the user's change will be reverted immediately to reflect `props.date` as the source of truth.
 
 ### Example
 
diff --git a/docs/imageeditor.md b/docs/imageeditor.md
index 8d7e918035e..7050440d078 100644
--- a/docs/imageeditor.md
+++ b/docs/imageeditor.md
@@ -1,6 +1,6 @@
 ---
 id: imageeditor
-title: ImageEditor
+title: 🚧 ImageEditor
 ---
 
 > **Deprecated.** Use [@react-native-community/image-editor](https://github.com/react-native-community/react-native-image-editor) instead.
diff --git a/docs/imagepickerios.md b/docs/imagepickerios.md
index 028f64c919e..5e4685eff8e 100644
--- a/docs/imagepickerios.md
+++ b/docs/imagepickerios.md
@@ -1,6 +1,6 @@
 ---
 id: imagepickerios
-title: ImagePickerIOS
+title: 🚧 ImagePickerIOS
 ---
 
 > **Deprecated.** Use [@react-native-community/image-picker-ios](https://github.com/react-native-community/react-native-image-picker-ios) instead.
diff --git a/docs/pickerios.md b/docs/pickerios.md
index 2d150597036..7807e1849c1 100644
--- a/docs/pickerios.md
+++ b/docs/pickerios.md
@@ -1,6 +1,6 @@
 ---
 id: pickerios
-title: PickerIOS
+title: 🚧 PickerIOS
 ---
 
 > **Deprecated.** Use [Picker](picker.md) instead.
diff --git a/docs/progressbarandroid.md b/docs/progressbarandroid.md
index 4f2fac9f186..b5f0c335e05 100644
--- a/docs/progressbarandroid.md
+++ b/docs/progressbarandroid.md
@@ -1,8 +1,10 @@
 ---
 id: progressbarandroid
-title: ProgressBarAndroid
+title: 🚧 ProgressBarAndroid
 ---
 
+> **Deprecated.** Use [@react-native-community/progress-bar-android](https://github.com/react-native-community/react-native-progress-bar-android) instead.
+
 Android-only React component used to indicate that the app is loading or there is some activity in the app.
 
 Example:
diff --git a/docs/progressviewios.md b/docs/progressviewios.md
index b5c6a6c4cc4..bf5824d2136 100644
--- a/docs/progressviewios.md
+++ b/docs/progressviewios.md
@@ -1,8 +1,10 @@
 ---
 id: progressviewios
-title: ProgressViewIOS
+title: 🚧 ProgressViewIOS
 ---
 
+> **Deprecated.** Use [@react-native-community/progress-view](https://github.com/react-native-community/react-native-progress-view) instead.
+
 Uses `ProgressViewIOS` to render a UIProgressView on iOS.
 
 ---
diff --git a/docs/pushnotificationios.md b/docs/pushnotificationios.md
index 7830725096f..369fec10d07 100644
--- a/docs/pushnotificationios.md
+++ b/docs/pushnotificationios.md
@@ -1,6 +1,6 @@
 ---
 id: pushnotificationios
-title: PushNotificationIOS
+title: 🚧 PushNotificationIOS
 ---
 
 > **Deprecated.** Use [@react-native-community/push-notification-ios](https://github.com/react-native-community/react-native-push-notification-ios) instead.
diff --git a/docs/segmentedcontrolios.md b/docs/segmentedcontrolios.md
index 0f505e256ca..728a0e00118 100644
--- a/docs/segmentedcontrolios.md
+++ b/docs/segmentedcontrolios.md
@@ -1,9 +1,9 @@
 ---
 id: segmentedcontrolios
-title: SegmentedControlIOS
+title: 🚧 SegmentedControlIOS
 ---
 
-> **Deprecated.** Use [@react-native-community/react-native-segmented-control](https://github.com/react-native-community/react-native-segmented-control) instead.
+> **Deprecated.** Use [@react-native-community/segmented-control](https://github.com/react-native-community/react-native-segmented-control) instead.
 
 Uses `SegmentedControlIOS` to render a UISegmentedControl iOS.
 
diff --git a/docs/slider.md b/docs/slider.md
index c2b8a06f131..80b40435bfe 100644
--- a/docs/slider.md
+++ b/docs/slider.md
@@ -1,9 +1,9 @@
 ---
 id: slider
-title: Slider
+title: 🚧 Slider
 ---
 
-> **Deprecated.** Use [react-native-community/react-native-slider](https://github.com/react-native-community/react-native-slider) instead.
+> **Deprecated.** Use [@react-native-community/slider](https://github.com/react-native-community/react-native-slider) instead.
 
 A component used to select a single value from a range of values.
 
diff --git a/docs/statusbarios.md b/docs/statusbarios.md
index 8d74ee7d4d3..ae1289efaba 100644
--- a/docs/statusbarios.md
+++ b/docs/statusbarios.md
@@ -1,8 +1,8 @@
 ---
 id: statusbarios
-title: StatusBarIOS
+title: 🚧 StatusBarIOS
 ---
 
-> Use `StatusBar` for mutating the status bar.
+> **Deprecated.** Use [`StatusBar`](statusbar.md) for mutating the status bar.
 
 ---
diff --git a/docs/timepickerandroid.md b/docs/timepickerandroid.md
index dbbf753810d..ba6ce8dfcf6 100644
--- a/docs/timepickerandroid.md
+++ b/docs/timepickerandroid.md
@@ -1,11 +1,11 @@
 ---
 id: timepickerandroid
-title: TimePickerAndroid
+title: 🚧 TimePickerAndroid
 ---
 
-Opens the standard Android time picker dialog.
+> **Deprecated.** Use [@react-native-community/datetimepicker](https://github.com/react-native-community/react-native-datetimepicker) instead.
 
-> `TimePickerAndroid` has been merged with `DatePickerIOS` and `DatePickerAndroid` into a single component called [DateTimePicker](https://github.com/react-native-community/react-native-datetimepicker#react-native-datetimepicker) and will be removed in a future release.
+Opens the standard Android time picker dialog.
 
 ### Example
 
diff --git a/docs/viewpagerandroid.md b/docs/viewpagerandroid.md
index 925814a6aae..489eb1352c7 100644
--- a/docs/viewpagerandroid.md
+++ b/docs/viewpagerandroid.md
@@ -1,9 +1,9 @@
 ---
 id: viewpagerandroid
-title: ViewPagerAndroid
+title: 🚧 ViewPagerAndroid
 ---
 
-> **Deprecated.** Use [react-native-community/react-native-viewpager](https://github.com/react-native-community/react-native-viewpager) instead.
+> **Deprecated.** Use [@react-native-community/viewpager](https://github.com/react-native-community/react-native-viewpager) instead.
 
 Container that allows to flip left and right between child views. Each child view of the `ViewPagerAndroid` will be treated as a separate page and will be stretched to fill the `ViewPagerAndroid`.
 
diff --git a/website/i18n/en.json b/website/i18n/en.json
index 00a74745da4..9a6859fe94b 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -21,7 +21,7 @@
         "title": "Alert"
       },
       "alertios": {
-        "title": "AlertIOS"
+        "title": "🚧 AlertIOS"
       },
       "animated": {
         "title": "Animated"
@@ -45,7 +45,7 @@
         "title": "AppState"
       },
       "asyncstorage": {
-        "title": "AsyncStorage"
+        "title": "🚧 AsyncStorage"
       },
       "backhandler": {
         "title": "BackHandler"
@@ -81,10 +81,10 @@
         "title": "Custom WebView"
       },
       "datepickerandroid": {
-        "title": "DatePickerAndroid"
+        "title": "🚧 DatePickerAndroid"
       },
       "datepickerios": {
-        "title": "DatePickerIOS"
+        "title": "🚧 DatePickerIOS"
       },
       "debugging": {
         "title": "Debugging"
@@ -141,10 +141,10 @@
         "title": "ImageBackground"
       },
       "imageeditor": {
-        "title": "ImageEditor"
+        "title": "🚧 ImageEditor"
       },
       "imagepickerios": {
-        "title": "ImagePickerIOS"
+        "title": "🚧 ImagePickerIOS"
       },
       "images": {
         "title": "Images"
@@ -234,7 +234,7 @@
         "title": "Picker"
       },
       "pickerios": {
-        "title": "PickerIOS"
+        "title": "🚧 PickerIOS"
       },
       "pixelratio": {
         "title": "PixelRatio"
@@ -243,16 +243,16 @@
         "title": "Platform Specific Code"
       },
       "progressbarandroid": {
-        "title": "ProgressBarAndroid"
+        "title": "🚧 ProgressBarAndroid"
       },
       "progressviewios": {
-        "title": "ProgressViewIOS"
+        "title": "🚧 ProgressViewIOS"
       },
       "props": {
         "title": "Props"
       },
       "pushnotificationios": {
-        "title": "PushNotificationIOS"
+        "title": "🚧 PushNotificationIOS"
       },
       "refreshcontrol": {
         "title": "RefreshControl"
@@ -276,7 +276,7 @@
         "title": "SectionList"
       },
       "segmentedcontrolios": {
-        "title": "SegmentedControlIOS"
+        "title": "🚧 SegmentedControlIOS"
       },
       "settings": {
         "title": "Settings"
@@ -291,7 +291,7 @@
         "title": "Publishing to Google Play Store"
       },
       "slider": {
-        "title": "Slider"
+        "title": "🚧 Slider"
       },
       "state": {
         "title": "State"
@@ -300,7 +300,7 @@
         "title": "StatusBar"
       },
       "statusbarios": {
-        "title": "StatusBarIOS"
+        "title": "🚧 StatusBarIOS"
       },
       "style": {
         "title": "Style"
@@ -324,7 +324,7 @@
         "title": "TextInput"
       },
       "timepickerandroid": {
-        "title": "TimePickerAndroid"
+        "title": "🚧 TimePickerAndroid"
       },
       "timers": {
         "title": "Timers"
@@ -378,7 +378,7 @@
         "title": "View"
       },
       "viewpagerandroid": {
-        "title": "ViewPagerAndroid"
+        "title": "🚧 ViewPagerAndroid"
       },
       "virtualizedlist": {
         "title": "VirtualizedList"