diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index ae6dbcb8b378ee..5785e204ed289d 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -29,7 +29,8 @@ def home_statuses
       limit_param(DEFAULT_STATUSES_LIMIT),
       params[:max_id],
       params[:since_id],
-      params[:min_id]
+      params[:min_id],
+      visibilities
     )
   end
 
@@ -60,4 +61,10 @@ def pagination_max_id
   def pagination_since_id
     @statuses.first.id
   end
+
+  def visibilities
+    val = params.permit(visibilities: [])[:visibilities] || []
+    val = [val] unless val.is_a?(Enumerable)
+    val
+  end
 end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 32b5d79487b741..cb7f08bc76fa5b 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -55,6 +55,17 @@ def user_settings_params
       :setting_use_pending_items,
       :setting_trends,
       :setting_crop_images,
+      :setting_show_follow_button_on_timeline,
+      :setting_show_subscribe_button_on_timeline,
+      :setting_show_followed_by,
+      :setting_follow_button_to_list_adder,
+      :setting_show_navigation_panel,
+      :setting_show_quote_button,
+      :setting_show_bookmark_button,
+      :setting_place_tab_bar_at_bottom,
+      :setting_show_tab_bar_label,
+      :setting_show_target,
+      :setting_enable_limited_timeline,
       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 8badd9eaf9b485..ab61be4cdedbc1 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -7,6 +7,7 @@ import { useEmoji } from './emojis';
 import resizeImage from '../utils/resize_image';
 import { importFetchedAccounts } from './importer';
 import { updateTimeline } from './timelines';
+import { getHomeVisibilities, getLimitedVisibilities } from 'mastodon/selectors';
 import { showAlertForError } from './alerts';
 import { showAlert } from './alerts';
 import { openModal } from './modal';
@@ -140,6 +141,8 @@ export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
     const status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
+    const homeVisibilities = getHomeVisibilities(getState());
+    const limitedVisibilities = getLimitedVisibilities(getState());
 
     if ((!status || !status.length) && media.size === 0) {
       return;
@@ -178,10 +181,14 @@ export function submitCompose(routerHistory) {
         }
       };
 
-      if (response.data.visibility !== 'direct') {
+      if (homeVisibilities.length == 0 || homeVisibilities.includes(response.data.visibility)) {
         insertIfOnline('home');
       }
 
+      if (limitedVisibilities.includes(response.data.visibility)) {
+        insertIfOnline('limited');
+      }
+
       if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
         insertIfOnline('community');
         insertIfOnline('public');
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index beb5c6a4a9de6c..bd535c91339133 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -8,6 +8,7 @@ import {
   connectTimeline,
   disconnectTimeline,
 } from './timelines';
+import { getHomeVisibilities } from 'mastodon/selectors';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateConversations } from './conversations';
 import {
@@ -44,10 +45,10 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
     let pollingId;
 
     /**
-     * @param {function(Function, Function): void} fallback
+     * @param {function(Function, Function, Function): void} fallback
      */
     const useFallback = fallback => {
-      fallback(dispatch, () => {
+      fallback(dispatch, getState, () => {
         pollingId = setTimeout(() => useFallback(fallback), 20000 + randomUpTo(20000));
       });
     };
@@ -105,8 +106,10 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
  * @param {Function} dispatch
  * @param {function(): void} done
  */
-const refreshHomeTimelineAndNotification = (dispatch, done) => {
-  dispatch(expandHomeTimeline({}, () =>
+const refreshHomeTimelineAndNotification = (dispatch, getState, done) => {
+  const visibilities = getHomeVisibilities(getState());
+
+  dispatch(expandHomeTimeline({ visibilities }, () =>
     dispatch(expandNotifications({}, () =>
       dispatch(fetchAnnouncements(done))))));
 };
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 31ae09e4ac5013..9a61f71bee99a5 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -1,37 +1,42 @@
-import { importFetchedStatus, importFetchedStatuses } from './importer';
-import { submitMarkers } from './markers';
-import api, { getLinks } from 'mastodon/api';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
-import compareId from 'mastodon/compare_id';
-import { usePendingItems as preferPendingItems } from 'mastodon/initial_state';
-
-export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
-export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
-export const TIMELINE_CLEAR   = 'TIMELINE_CLEAR';
-
-export const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST';
-export const TIMELINE_EXPAND_SUCCESS = 'TIMELINE_EXPAND_SUCCESS';
-export const TIMELINE_EXPAND_FAIL    = 'TIMELINE_EXPAND_FAIL';
-
-export const TIMELINE_SCROLL_TOP   = 'TIMELINE_SCROLL_TOP';
-export const TIMELINE_LOAD_PENDING = 'TIMELINE_LOAD_PENDING';
-export const TIMELINE_DISCONNECT   = 'TIMELINE_DISCONNECT';
-export const TIMELINE_CONNECT      = 'TIMELINE_CONNECT';
-
-export const TIMELINE_MARK_AS_PARTIAL = 'TIMELINE_MARK_AS_PARTIAL';
-
-export const loadPending = timeline => ({
+import { importFetchedStatus, importFetchedStatuses } from "./importer";
+import { submitMarkers } from "./markers";
+import api, { getLinks } from "mastodon/api";
+import { Map as ImmutableMap, List as ImmutableList } from "immutable";
+import compareId from "mastodon/compare_id";
+import { usePendingItems as preferPendingItems } from "mastodon/initial_state";
+import {
+  getHomeVisibilities,
+  getLimitedVisibilities,
+} from "mastodon/selectors";
+import { uniq } from "../utils/uniq";
+
+export const TIMELINE_UPDATE = "TIMELINE_UPDATE";
+export const TIMELINE_DELETE = "TIMELINE_DELETE";
+export const TIMELINE_CLEAR = "TIMELINE_CLEAR";
+
+export const TIMELINE_EXPAND_REQUEST = "TIMELINE_EXPAND_REQUEST";
+export const TIMELINE_EXPAND_SUCCESS = "TIMELINE_EXPAND_SUCCESS";
+export const TIMELINE_EXPAND_FAIL = "TIMELINE_EXPAND_FAIL";
+
+export const TIMELINE_SCROLL_TOP = "TIMELINE_SCROLL_TOP";
+export const TIMELINE_LOAD_PENDING = "TIMELINE_LOAD_PENDING";
+export const TIMELINE_DISCONNECT = "TIMELINE_DISCONNECT";
+export const TIMELINE_CONNECT = "TIMELINE_CONNECT";
+
+export const TIMELINE_MARK_AS_PARTIAL = "TIMELINE_MARK_AS_PARTIAL";
+
+export const loadPending = (timeline) => ({
   type: TIMELINE_LOAD_PENDING,
   timeline,
 });
 
 export function updateTimeline(timeline, status, accept) {
   return (dispatch, getState) => {
-    if (typeof accept === 'function' && !accept(status)) {
+    if (typeof accept === "function" && !accept(status)) {
       return;
     }
 
-    if (getState().getIn(['timelines', timeline, 'isPartial'])) {
+    if (getState().getIn(["timelines", timeline, "isPartial"])) {
       // Prevent new items from being added to a partial timeline,
       // since it will be reloaded anyway
 
@@ -40,24 +45,45 @@ export function updateTimeline(timeline, status, accept) {
 
     dispatch(importFetchedStatus(status));
 
-    dispatch({
-      type: TIMELINE_UPDATE,
-      timeline,
-      status,
-      usePendingItems: preferPendingItems,
-    });
+    const insertTimeline = (timeline) => {
+      dispatch({
+        type: TIMELINE_UPDATE,
+        timeline,
+        status,
+        usePendingItems: preferPendingItems,
+      });
+    };
+
+    const visibility = status.visibility_ex || status.visibility;
+    const homeVisibilities = getHomeVisibilities(getState());
+    const limitedVisibilities = getLimitedVisibilities(getState());
+
+    if (timeline === "home") {
+      if (
+        homeVisibilities.length == 0 ||
+        homeVisibilities.includes(visibility)
+      ) {
+        insertTimeline("home");
+        dispatch(submitMarkers());
+      }
 
-    if (timeline === 'home') {
-      dispatch(submitMarkers());
+      if (limitedVisibilities.includes(visibility)) {
+        insertTimeline("limited");
+      }
+    } else {
+      insertTimeline(timeline);
     }
   };
-};
+}
 
 export function deleteFromTimelines(id) {
   return (dispatch, getState) => {
-    const accountId  = getState().getIn(['statuses', id, 'account']);
-    const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => status.get('id'));
-    const reblogOf   = getState().getIn(['statuses', id, 'reblog'], null);
+    const accountId = getState().getIn(["statuses", id, "account"]);
+    const references = getState()
+      .get("statuses")
+      .filter((status) => status.get("reblog") === id)
+      .map((status) => status.get("id"));
+    const reblogOf = getState().getIn(["statuses", id, "reblog"], null);
 
     dispatch({
       type: TIMELINE_DELETE,
@@ -67,13 +93,13 @@ export function deleteFromTimelines(id) {
       reblogOf,
     });
   };
-};
+}
 
 export function clearTimeline(timeline) {
   return (dispatch) => {
     dispatch({ type: TIMELINE_CLEAR, timeline });
   };
-};
+}
 
 const noOp = () => {};
 
@@ -85,17 +111,26 @@ const parseTags = (tags = {}, mode) => {
 
 export function expandTimeline(timelineId, path, params = {}, done = noOp) {
   return (dispatch, getState) => {
-    const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
+    const timeline = getState().getIn(
+      ["timelines", timelineId],
+      ImmutableMap()
+    );
     const isLoadingMore = !!params.max_id;
 
-    if (timeline.get('isLoading')) {
+    if (timeline.get("isLoading")) {
       done();
       return;
     }
 
-    if (!params.max_id && !params.pinned && (timeline.get('items', ImmutableList()).size + timeline.get('pendingItems', ImmutableList()).size) > 0) {
-      const a = timeline.getIn(['pendingItems', 0]);
-      const b = timeline.getIn(['items', 0]);
+    if (
+      !params.max_id &&
+      !params.pinned &&
+      timeline.get("items", ImmutableList()).size +
+        timeline.get("pendingItems", ImmutableList()).size >
+        0
+    ) {
+      const a = timeline.getIn(["pendingItems", 0]);
+      const b = timeline.getIn(["items", 0]);
 
       if (a && b && compareId(a, b) > 0) {
         params.since_id = a;
@@ -108,37 +143,117 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 
     dispatch(expandTimelineRequest(timelineId, isLoadingMore));
 
-    api(getState).get(path, { params }).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedStatuses(response.data));
-      dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.status === 206, isLoadingRecent, isLoadingMore, isLoadingRecent && preferPendingItems));
-
-      if (timelineId === 'home') {
-        dispatch(submitMarkers());
-      }
-    }).catch(error => {
-      dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
-    }).finally(() => {
-      done();
-    });
+    api(getState)
+      .get(path, { params })
+      .then((response) => {
+        const next = getLinks(response).refs.find(
+          (link) => link.rel === "next"
+        );
+        dispatch(importFetchedStatuses(response.data));
+        dispatch(
+          expandTimelineSuccess(
+            timelineId,
+            response.data,
+            next ? next.uri : null,
+            response.status === 206,
+            isLoadingRecent,
+            isLoadingMore,
+            isLoadingRecent && preferPendingItems
+          )
+        );
+
+        if (timelineId === "home") {
+          dispatch(submitMarkers());
+        }
+      })
+      .catch((error) => {
+        dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
+      })
+      .finally(() => {
+        done();
+      });
   };
-};
-
-export const expandHomeTimeline            = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done);
-export const expandPublicTimeline          = ({ maxId, onlyMedia, onlyRemote } = {}, done = noOp) => expandTimeline(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia }, done);
-export const expandCommunityTimeline       = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`community${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { local: true, max_id: maxId, only_media: !!onlyMedia }, done);
-export const expandAccountTimeline         = (accountId, { maxId, withReplies } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, max_id: maxId });
-export const expandAccountFeaturedTimeline = accountId => expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true });
-export const expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 });
-export const expandListTimeline            = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
-export const expandHashtagTimeline         = (hashtag, { maxId, tags, local } = {}, done = noOp) => {
-  return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, {
-    max_id: maxId,
-    any:    parseTags(tags, 'any'),
-    all:    parseTags(tags, 'all'),
-    none:   parseTags(tags, 'none'),
-    local:  local,
-  }, done);
+}
+
+export const expandHomeTimeline = ({ maxId, visibilities } = {}, done = noOp) =>
+  expandTimeline(
+    "home",
+    "/api/v1/timelines/home",
+    { max_id: maxId, visibilities: visibilities },
+    done
+  );
+export const expandLimitedTimeline = (
+  { maxId, visibilities } = {},
+  done = noOp
+) =>
+  expandTimeline(
+    "limited",
+    "/api/v1/timelines/home",
+    { max_id: maxId, visibilities: visibilities },
+    done
+  );
+export const expandPublicTimeline = (
+  { maxId, onlyMedia, onlyRemote } = {},
+  done = noOp
+) =>
+  expandTimeline(
+    `public${onlyRemote ? ":remote" : ""}${onlyMedia ? ":media" : ""}`,
+    "/api/v1/timelines/public",
+    { remote: !!onlyRemote, max_id: maxId, only_media: !!onlyMedia },
+    done
+  );
+export const expandCommunityTimeline = (
+  { maxId, onlyMedia } = {},
+  done = noOp
+) =>
+  expandTimeline(
+    `community${onlyMedia ? ":media" : ""}`,
+    "/api/v1/timelines/public",
+    { local: true, max_id: maxId, only_media: !!onlyMedia },
+    done
+  );
+export const expandAccountTimeline = (accountId, { maxId, withReplies } = {}) =>
+  expandTimeline(
+    `account:${accountId}${withReplies ? ":with_replies" : ""}`,
+    `/api/v1/accounts/${accountId}/statuses`,
+    { exclude_replies: !withReplies, max_id: maxId }
+  );
+export const expandAccountFeaturedTimeline = (accountId) =>
+  expandTimeline(
+    `account:${accountId}:pinned`,
+    `/api/v1/accounts/${accountId}/statuses`,
+    { pinned: true }
+  );
+export const expandAccountMediaTimeline = (accountId, { maxId } = {}) =>
+  expandTimeline(
+    `account:${accountId}:media`,
+    `/api/v1/accounts/${accountId}/statuses`,
+    { max_id: maxId, only_media: true, limit: 40 }
+  );
+export const expandListTimeline = (id, { maxId } = {}, done = noOp) =>
+  expandTimeline(
+    `list:${id}`,
+    `/api/v1/timelines/list/${id}`,
+    { max_id: maxId },
+    done
+  );
+export const expandHashtagTimeline = (
+  hashtag,
+  { maxId, tags, local } = {},
+  done = noOp
+) => {
+  return expandTimeline(
+    `hashtag:${hashtag}${local ? ":local" : ""}`,
+    `/api/v1/timelines/tag/${hashtag}`,
+    {
+      max_id: maxId,
+      any: parseTags(tags, "any"),
+      all: parseTags(tags, "all"),
+      none: parseTags(tags, "none"),
+      local: local,
+    },
+    done
+  );
 };
 
 export function expandTimelineRequest(timeline, isLoadingMore) {
@@ -147,9 +262,17 @@ export function expandTimelineRequest(timeline, isLoadingMore) {
     timeline,
     skipLoading: !isLoadingMore,
   };
-};
+}
 
-export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadingRecent, isLoadingMore, usePendingItems) {
+export function expandTimelineSuccess(
+  timeline,
+  statuses,
+  next,
+  partial,
+  isLoadingRecent,
+  isLoadingMore,
+  usePendingItems
+) {
   return {
     type: TIMELINE_EXPAND_SUCCESS,
     timeline,
@@ -160,7 +283,7 @@ export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadi
     usePendingItems,
     skipLoading: !isLoadingMore,
   };
-};
+}
 
 export function expandTimelineFail(timeline, error, isLoadingMore) {
   return {
@@ -168,9 +291,9 @@ export function expandTimelineFail(timeline, error, isLoadingMore) {
     timeline,
     error,
     skipLoading: !isLoadingMore,
-    skipNotFound: timeline.startsWith('account:'),
+    skipNotFound: timeline.startsWith("account:"),
   };
-};
+}
 
 export function scrollTopTimeline(timeline, top) {
   return {
@@ -178,22 +301,22 @@ export function scrollTopTimeline(timeline, top) {
     timeline,
     top,
   };
-};
+}
 
 export function connectTimeline(timeline) {
   return {
     type: TIMELINE_CONNECT,
     timeline,
   };
-};
+}
 
-export const disconnectTimeline = timeline => ({
+export const disconnectTimeline = (timeline) => ({
   type: TIMELINE_DISCONNECT,
   timeline,
   usePendingItems: preferPendingItems,
 });
 
-export const markAsPartial = timeline => ({
+export const markAsPartial = (timeline) => ({
   type: TIMELINE_MARK_AS_PARTIAL,
   timeline,
 });
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 663dd324f35631..61e17fa787698b 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -1,45 +1,103 @@
-import React from 'react';
-import ComposeFormContainer from './containers/compose_form_container';
-import NavigationContainer from './containers/navigation_container';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { connect } from 'react-redux';
-import { mountCompose, unmountCompose } from '../../actions/compose';
-import { Link } from 'react-router-dom';
-import { injectIntl, defineMessages } from 'react-intl';
-import SearchContainer from './containers/search_container';
-import Motion from '../ui/util/optional_motion';
-import spring from 'react-motion/lib/spring';
-import SearchResultsContainer from './containers/search_results_container';
-import { changeComposing } from '../../actions/compose';
-import { openModal } from 'mastodon/actions/modal';
-import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
-import { mascot } from '../../initial_state';
-import Icon from 'mastodon/components/icon';
-import { logOut } from 'mastodon/utils/log_out';
+import React from "react";
+import ComposeFormContainer from "./containers/compose_form_container";
+import NavigationContainer from "./containers/navigation_container";
+import PropTypes from "prop-types";
+import ImmutablePropTypes from "react-immutable-proptypes";
+import { connect } from "react-redux";
+import { mountCompose, unmountCompose } from "../../actions/compose";
+import { Link } from "react-router-dom";
+import { injectIntl, defineMessages } from "react-intl";
+import SearchContainer from "./containers/search_container";
+import Motion from "../ui/util/optional_motion";
+import spring from "react-motion/lib/spring";
+import SearchResultsContainer from "./containers/search_results_container";
+import { changeComposing } from "../../actions/compose";
+import { openModal } from "mastodon/actions/modal";
+import elephantUIPlane from "../../../images/elephant_ui_plane.svg";
+import {
+  mascot,
+  show_tab_bar_label,
+  enable_limited_timeline,
+} from "../../initial_state";
+import Icon from "mastodon/components/icon";
+import { logOut } from "mastodon/utils/log_out";
 
 const messages = defineMessages({
-  start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
-  home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
-  notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
-  public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
-  community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
-  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
-  logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
-  compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new toot' },
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
+  short_start: {
+    id: "navigation_bar.short.getting_started",
+    defaultMessage: "Started",
+  },
+  short_home_timeline: {
+    id: "navigation_bar.short.home",
+    defaultMessage: "Home",
+  },
+  short_limited_timeline: {
+    id: "navigation_bar.short.limited_timeline",
+    defaultMessage: "Ltd.",
+  },
+  short_notifications: {
+    id: "navigation_bar.short.notifications",
+    defaultMessage: "Notif.",
+  },
+  short_public: {
+    id: "navigation_bar.short.public_timeline",
+    defaultMessage: "FTL",
+  },
+  short_community: {
+    id: "navigation_bar.short.community_timeline",
+    defaultMessage: "LTL",
+  },
+  short_lists: { id: "navigation_bar.short.lists", defaultMessage: "Lists" },
+  short_preferences: {
+    id: "navigation_bar.short.preferences",
+    defaultMessage: "Pref.",
+  },
+  short_logout: { id: "navigation_bar.short.logout", defaultMessage: "Logout" },
+  start: { id: "getting_started.heading", defaultMessage: "Getting started" },
+  home_timeline: { id: "tabs_bar.home", defaultMessage: "Home" },
+  limited_timeline: {
+    id: "tabs_bar.limited_timeline",
+    defaultMessage: "Limited home",
+  },
+  notifications: {
+    id: "tabs_bar.notifications",
+    defaultMessage: "Notifications",
+  },
+  public: {
+    id: "navigation_bar.public_timeline",
+    defaultMessage: "Federated timeline",
+  },
+  community: {
+    id: "navigation_bar.community_timeline",
+    defaultMessage: "Local timeline",
+  },
+  preferences: {
+    id: "navigation_bar.preferences",
+    defaultMessage: "Preferences",
+  },
+  logout: { id: "navigation_bar.logout", defaultMessage: "Logout" },
+  compose: { id: "navigation_bar.compose", defaultMessage: "Compose new toot" },
+  logoutMessage: {
+    id: "confirmations.logout.message",
+    defaultMessage: "Are you sure you want to log out?",
+  },
+  logoutConfirm: {
+    id: "confirmations.logout.confirm",
+    defaultMessage: "Log out",
+  },
 });
 
 const mapStateToProps = (state, ownProps) => ({
-  columns: state.getIn(['settings', 'columns']),
-  showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : ownProps.isSearchPage,
+  columns: state.getIn(["settings", "columns"]),
+  showSearch: ownProps.multiColumn
+    ? state.getIn(["search", "submitted"]) && !state.getIn(["search", "hidden"])
+    : ownProps.isSearchPage,
 });
 
-export default @connect(mapStateToProps)
+export default
+@connect(mapStateToProps)
 @injectIntl
 class Compose extends React.PureComponent {
-
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
     columns: ImmutablePropTypes.list.isRequired,
@@ -49,7 +107,7 @@ class Compose extends React.PureComponent {
     intl: PropTypes.object.isRequired,
   };
 
-  componentDidMount () {
+  componentDidMount() {
     const { isSearchPage } = this.props;
 
     if (!isSearchPage) {
@@ -57,7 +115,7 @@ class Compose extends React.PureComponent {
     }
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     const { isSearchPage } = this.props;
 
     if (!isSearchPage) {
@@ -65,78 +123,274 @@ class Compose extends React.PureComponent {
     }
   }
 
-  handleLogoutClick = e => {
+  handleLogoutClick = (e) => {
     const { dispatch, intl } = this.props;
 
     e.preventDefault();
     e.stopPropagation();
 
-    dispatch(openModal('CONFIRM', {
-      message: intl.formatMessage(messages.logoutMessage),
-      confirm: intl.formatMessage(messages.logoutConfirm),
-      closeWhenConfirm: false,
-      onConfirm: () => logOut(),
-    }));
+    dispatch(
+      openModal("CONFIRM", {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      })
+    );
 
     return false;
-  }
+  };
 
   onFocus = () => {
     this.props.dispatch(changeComposing(true));
-  }
+  };
 
   onBlur = () => {
     this.props.dispatch(changeComposing(false));
+  };
+
+  tab(id) {
+    const {
+      columns,
+      intl: { formatMessage },
+    } = this.props;
+
+    if (!columns.some((column) => column.get("id") === id)) {
+      const tabParams = {
+        START: {
+          to: "/getting-started",
+          title: formatMessage(messages.start),
+          label: formatMessage(messages.short_start),
+          icon_id: "bars",
+        },
+        HOME: {
+          to: "/timelines/home",
+          title: formatMessage(messages.home_timeline),
+          label: formatMessage(messages.short_home_timeline),
+          icon_id: "home",
+        },
+        LIMITED: {
+          to: "/timelines/limited",
+          title: formatMessage(messages.limited_timeline),
+          label: formatMessage(messages.short_limited_timeline),
+          icon_id: "lock",
+        },
+        NOTIFICATIONS: {
+          to: "/notifications",
+          title: formatMessage(messages.notifications),
+          label: formatMessage(messages.short_notifications),
+          icon_id: "bell",
+        },
+        COMMUNITY: {
+          to: "/timelines/public/local",
+          title: formatMessage(messages.community),
+          label: formatMessage(messages.short_community),
+          icon_id: "users",
+        },
+        PUBLIC: {
+          to: "/timelines/public",
+          title: formatMessage(messages.public),
+          label: formatMessage(messages.short_public),
+          icon_id: "globe",
+        },
+        PREFERENCES: {
+          href: "/settings/preferences",
+          title: formatMessage(messages.preferences),
+          label: formatMessage(messages.short_preferences),
+          icon_id: "cog",
+        },
+        SIGN_OUT: {
+          href: "/auth/sign_out",
+          title: formatMessage(messages.logout),
+          label: formatMessage(messages.short_logout),
+          icon_id: "sign-out",
+          method: "delete",
+        },
+      };
+
+      const { href, to, title, label, icon_id, method } = tabParams[id];
+
+      const icon =
+        id === "NOTIFICATIONS" ? (
+          <NotificationsCounterIcon />
+        ) : (
+          <Icon id={icon_id} fixedWidth />
+        );
+
+      if (href) {
+        return (
+          <a
+            href={href}
+            className={classNames("drawer__tab", {
+              "short-label": show_tab_bar_label,
+            })}
+            title={title}
+            aria-label={title}
+            data-method={method}
+          >
+            {icon}
+            <span className="drawer__tab__short-label">{label}</span>
+          </a>
+        );
+      } else {
+        return (
+          <Link
+            to={to}
+            className={classNames("drawer__tab", {
+              "short-label": show_tab_bar_label,
+            })}
+            title={title}
+            aria-label={title}
+          >
+            {icon}
+            <span className="drawer__tab__short-label">{label}</span>
+          </Link>
+        );
+      }
+    }
+    return null;
   }
 
-  render () {
+  render() {
     const { multiColumn, showSearch, isSearchPage, intl } = this.props;
 
-    let header = '';
+    let header = "";
 
     if (multiColumn) {
-      const { columns } = this.props;
+      const defaultTabIds = enable_limited_timeline
+        ? [
+            "START",
+            "HOME",
+            "LIMITED",
+            "NOTIFICATIONS",
+            "COMMUNITY",
+            "PUBLIC",
+            "PREFERENCES",
+            "SIGN_OUT",
+          ]
+        : [
+            "START",
+            "HOME",
+            "NOTIFICATIONS",
+            "COMMUNITY",
+            "PUBLIC",
+            "PREFERENCES",
+            "SIGN_OUT",
+          ];
+
+      let tabs = defaultTabIds;
+
       header = (
-        <nav className='drawer__header'>
-          <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><Icon id='bars' fixedWidth /></Link>
-          {!columns.some(column => column.get('id') === 'HOME') && (
-            <Link to='/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><Icon id='home' fixedWidth /></Link>
+        <nav className="drawer__header">
+          <Link
+            to="/getting-started"
+            className="drawer__tab"
+            title={intl.formatMessage(messages.start)}
+            aria-label={intl.formatMessage(messages.start)}
+          >
+            <Icon id="bars" fixedWidth />
+          </Link>
+          {!columns.some((column) => column.get("id") === "HOME") && (
+            <Link
+              to="/home"
+              className="drawer__tab"
+              title={intl.formatMessage(messages.home_timeline)}
+              aria-label={intl.formatMessage(messages.home_timeline)}
+            >
+              <Icon id="home" fixedWidth />
+            </Link>
           )}
-          {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
-            <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)} aria-label={intl.formatMessage(messages.notifications)}><Icon id='bell' fixedWidth /></Link>
+          {!columns.some((column) => column.get("id") === "NOTIFICATIONS") && (
+            <Link
+              to="/notifications"
+              className="drawer__tab"
+              title={intl.formatMessage(messages.notifications)}
+              aria-label={intl.formatMessage(messages.notifications)}
+            >
+              <Icon id="bell" fixedWidth />
+            </Link>
           )}
-          {!columns.some(column => column.get('id') === 'COMMUNITY') && (
-            <Link to='/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)} aria-label={intl.formatMessage(messages.community)}><Icon id='users' fixedWidth /></Link>
+          {!columns.some((column) => column.get("id") === "COMMUNITY") && (
+            <Link
+              to="/public/local"
+              className="drawer__tab"
+              title={intl.formatMessage(messages.community)}
+              aria-label={intl.formatMessage(messages.community)}
+            >
+              <Icon id="users" fixedWidth />
+            </Link>
           )}
-          {!columns.some(column => column.get('id') === 'PUBLIC') && (
-            <Link to='/public' className='drawer__tab' title={intl.formatMessage(messages.public)} aria-label={intl.formatMessage(messages.public)}><Icon id='globe' fixedWidth /></Link>
+          {!columns.some((column) => column.get("id") === "PUBLIC") && (
+            <Link
+              to="/public"
+              className="drawer__tab"
+              title={intl.formatMessage(messages.public)}
+              aria-label={intl.formatMessage(messages.public)}
+            >
+              <Icon id="globe" fixedWidth />
+            </Link>
           )}
-          <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)} aria-label={intl.formatMessage(messages.preferences)}><Icon id='cog' fixedWidth /></a>
-          <a href='/auth/sign_out' className='drawer__tab' title={intl.formatMessage(messages.logout)} aria-label={intl.formatMessage(messages.logout)} onClick={this.handleLogoutClick}><Icon id='sign-out' fixedWidth /></a>
+          <a
+            href="/settings/preferences"
+            className="drawer__tab"
+            title={intl.formatMessage(messages.preferences)}
+            aria-label={intl.formatMessage(messages.preferences)}
+          >
+            <Icon id="cog" fixedWidth />
+          </a>
+          <a
+            href="/auth/sign_out"
+            className="drawer__tab"
+            title={intl.formatMessage(messages.logout)}
+            aria-label={intl.formatMessage(messages.logout)}
+            onClick={this.handleLogoutClick}
+          >
+            <Icon id="sign-out" fixedWidth />
+          </a>
         </nav>
       );
     }
 
     return (
-      <div className='drawer' role='region' aria-label={intl.formatMessage(messages.compose)}>
+      <div
+        className="drawer"
+        role="region"
+        aria-label={intl.formatMessage(messages.compose)}
+      >
         {header}
 
-        {(multiColumn || isSearchPage) && <SearchContainer /> }
+        {(multiColumn || isSearchPage) && <SearchContainer />}
 
-        <div className='drawer__pager'>
-          {!isSearchPage && <div className='drawer__inner' onFocus={this.onFocus}>
-            <NavigationContainer onClose={this.onBlur} />
+        <div className="drawer__pager">
+          {!isSearchPage && (
+            <div className="drawer__inner" onFocus={this.onFocus}>
+              <NavigationContainer onClose={this.onBlur} />
 
-            <ComposeFormContainer />
+              <ComposeFormContainer />
 
-            <div className='drawer__inner__mastodon'>
-              <img alt='' draggable='false' src={mascot || elephantUIPlane} />
+              <div className="drawer__inner__mastodon">
+                <img alt="" draggable="false" src={mascot || elephantUIPlane} />
+              </div>
             </div>
-          </div>}
+          )}
 
-          <Motion defaultStyle={{ x: isSearchPage ? 0 : -100 }} style={{ x: spring(showSearch || isSearchPage ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
+          <Motion
+            defaultStyle={{ x: isSearchPage ? 0 : -100 }}
+            style={{
+              x: spring(showSearch || isSearchPage ? 0 : -100, {
+                stiffness: 210,
+                damping: 20,
+              }),
+            }}
+          >
             {({ x }) => (
-              <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
+              <div
+                className="drawer__inner darker"
+                style={{
+                  transform: `translateX(${x}%)`,
+                  visibility: x === -100 ? "hidden" : "visible",
+                }}
+              >
                 <SearchResultsContainer />
               </div>
             )}
@@ -145,5 +399,4 @@ class Compose extends React.PureComponent {
       </div>
     );
   }
-
 }
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index b538b862e8995f..9fc17112ea62db 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { me, profile_directory, showTrends } from '../../initial_state';
+import { me, profile_directory, showTrends, enable_limited_timeline } from '../../initial_state';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { List as ImmutableList } from 'immutable';
 import NavigationContainer from '../compose/containers/navigation_container';
@@ -30,6 +30,7 @@ const messages = defineMessages({
   domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+  limited_timeline: { id: 'navigation_bar.limited_timeline', defaultMessage: 'Limited home' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   circles: { id: 'navigation_bar.circles', defaultMessage: 'Circles' },
   discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
@@ -133,6 +134,13 @@ class GettingStarted extends ImmutablePureComponent {
       height += 48;
     }
 
+    if (enable_limited_timeline && multiColumn && !columns.find(item => item.get('id') === 'LIMITED')) {
+      navItems.push(
+        <ColumnLink key='limited_timeline' icon='lock' text={intl.formatMessage(messages.limited_timeline)} to='/timelines/limited' />,
+      );
+      height += 48;
+    }
+
     navItems.push(
       <ColumnLink key='direct' icon='envelope' text={intl.formatMessage(messages.direct)} to='/conversations' />,
       <ColumnLink key='bookmark' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} to='/bookmarks' />,
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
index 455e218817cfe7..0247f60e2a9303 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import SettingToggle from '../../notifications/components/setting_toggle';
+import { enable_limited_timeline } from 'mastodon/initial_state';
 
 export default @injectIntl
 class ColumnSettings extends React.PureComponent {
@@ -10,11 +11,12 @@ class ColumnSettings extends React.PureComponent {
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
+    onChangeClear: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
 
   render () {
-    const { settings, onChange } = this.props;
+    const { settings, onChange, onChangeClear } = this.props;
 
     return (
       <div>
@@ -27,6 +29,22 @@ class ColumnSettings extends React.PureComponent {
         <div className='column-settings__row'>
           <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />} />
         </div>
+
+        {enable_limited_timeline && <Fragment>
+          <span className='column-settings__section'><FormattedMessage id='home.column_settings.visibility' defaultMessage='Visibility' /></span>
+
+          <div className='column-settings__row'>
+            <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'private']} onChange={onChangeClear} label={<FormattedMessage id='home.column_settings.show_private' defaultMessage='Show private' />} />
+          </div>
+
+          <div className='column-settings__row'>
+            <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'limited']} onChange={onChangeClear} label={<FormattedMessage id='home.column_settings.show_limited' defaultMessage='Show limited' />} />
+          </div>
+
+          <div className='column-settings__row'>
+            <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'direct']} onChange={onChangeClear} label={<FormattedMessage id='home.column_settings.show_direct' defaultMessage='Show direct' />} />
+          </div>
+        </Fragment>}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js
index fd8a392982ab4a..ed9d61e8eb6524 100644
--- a/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js
@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 import ColumnSettings from '../components/column_settings';
 import { changeSetting, saveSettings } from '../../../actions/settings';
+import { clearTimeline } from '../../../actions/timelines';
 
 const mapStateToProps = state => ({
   settings: state.getIn(['settings', 'home']),
@@ -12,6 +13,11 @@ const mapDispatchToProps = dispatch => ({
     dispatch(changeSetting(['home', ...key], checked));
   },
 
+  onChangeClear (key, checked) {
+    dispatch(changeSetting(['home', ...key], checked));
+    dispatch(clearTimeline('home'));
+  },
+
   onSave () {
     dispatch(saveSettings());
   },
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index dc440f2fe00a9f..a3fea194b9b4bc 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { expandHomeTimeline } from '../../actions/timelines';
+import { getHomeVisibilities } from 'mastodon/selectors';
 import PropTypes from 'prop-types';
 import StatusListContainer from '../ui/containers/status_list_container';
 import Column from '../../components/column';
@@ -26,6 +27,7 @@ const mapStateToProps = state => ({
   hasAnnouncements: !state.getIn(['announcements', 'items']).isEmpty(),
   unreadAnnouncements: state.getIn(['announcements', 'items']).count(item => !item.get('read')),
   showAnnouncements: state.getIn(['announcements', 'show']),
+  visibilities: getHomeVisibilities(state),
 });
 
 export default @connect(mapStateToProps)
@@ -42,6 +44,7 @@ class HomeTimeline extends React.PureComponent {
     hasAnnouncements: PropTypes.bool,
     unreadAnnouncements: PropTypes.number,
     showAnnouncements: PropTypes.bool,
+    visibilities: PropTypes.arrayOf(PropTypes.string),
   };
 
   handlePin = () => {
@@ -68,7 +71,9 @@ class HomeTimeline extends React.PureComponent {
   }
 
   handleLoadMore = maxId => {
-    this.props.dispatch(expandHomeTimeline({ maxId }));
+    const { visibilities } = this.props;
+
+    this.props.dispatch(expandHomeTimeline({ maxId, visibilities }));
   }
 
   componentDidMount () {
@@ -77,6 +82,12 @@ class HomeTimeline extends React.PureComponent {
   }
 
   componentDidUpdate (prevProps) {
+    const { dispatch, visibilities } = this.props;
+
+    if (prevProps.visibilities.toString() !== visibilities.toString()) {
+      dispatch(expandHomeTimeline({ visibilities }));
+    }
+
     this._checkIfReloadNeeded(prevProps.isPartial, this.props.isPartial);
   }
 
@@ -85,13 +96,13 @@ class HomeTimeline extends React.PureComponent {
   }
 
   _checkIfReloadNeeded (wasPartial, isPartial) {
-    const { dispatch } = this.props;
+    const { dispatch, visibilities } = this.props;
 
     if (wasPartial === isPartial) {
       return;
     } else if (!wasPartial && isPartial) {
       this.polling = setInterval(() => {
-        dispatch(expandHomeTimeline());
+        dispatch(expandHomeTimeline({ visibilities }));
       }, 3000);
     } else if (wasPartial && !isPartial) {
       this._stopPolling();
diff --git a/app/javascript/mastodon/features/limited_timeline/components/column_settings.js b/app/javascript/mastodon/features/limited_timeline/components/column_settings.js
new file mode 100644
index 00000000000000..e93b1a55d38c5b
--- /dev/null
+++ b/app/javascript/mastodon/features/limited_timeline/components/column_settings.js
@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { injectIntl, FormattedMessage } from 'react-intl';
+import SettingToggle from '../../notifications/components/setting_toggle';
+
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {
+
+  static propTypes = {
+    settings: ImmutablePropTypes.map.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onChangeClear: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  render () {
+    const { settings, onChange, onChangeClear } = this.props;
+
+    return (
+      <div>
+        <span className='column-settings__section'><FormattedMessage id='limited.column_settings.basic' defaultMessage='Basic' /></span>
+
+        <div className='column-settings__row'>
+          <SettingToggle prefix='limited_timeline' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='limited.column_settings.show_reblogs' defaultMessage='Show boosts' />} />
+        </div>
+
+        <div className='column-settings__row'>
+          <SettingToggle prefix='limited_timeline' settings={settings} settingPath={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='limited.column_settings.show_replies' defaultMessage='Show replies' />} />
+        </div>
+
+        <span className='column-settings__section'><FormattedMessage id='limited.column_settings.visibility' defaultMessage='Visibility' /></span>
+
+        <div className='column-settings__row'>
+          <SettingToggle prefix='limited_timeline' settings={settings} settingPath={['shows', 'private']} onChange={onChangeClear} label={<FormattedMessage id='limited.column_settings.show_private' defaultMessage='Show private' />} />
+        </div>
+
+        <div className='column-settings__row'>
+          <SettingToggle prefix='limited_timeline' settings={settings} settingPath={['shows', 'limited']} onChange={onChangeClear} label={<FormattedMessage id='limited.column_settings.show_limited' defaultMessage='Show limited' />} />
+        </div>
+
+        <div className='column-settings__row'>
+          <SettingToggle prefix='limited_timeline' settings={settings} settingPath={['shows', 'direct']} onChange={onChangeClear} label={<FormattedMessage id='limited.column_settings.show_direct' defaultMessage='Show direct' />} />
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/limited_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/limited_timeline/containers/column_settings_container.js
new file mode 100644
index 00000000000000..1bdb8183c77b49
--- /dev/null
+++ b/app/javascript/mastodon/features/limited_timeline/containers/column_settings_container.js
@@ -0,0 +1,27 @@
+import { connect } from 'react-redux';
+import ColumnSettings from '../components/column_settings';
+import { changeSetting, saveSettings } from '../../../actions/settings';
+import { clearTimeline } from '../../../actions/timelines';
+
+const mapStateToProps = state => ({
+  settings: state.getIn(['settings', 'limited']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onChange (key, checked) {
+    dispatch(changeSetting(['limited', ...key], checked));
+  },
+
+  onChangeClear (key, checked) {
+    dispatch(changeSetting(['limited', ...key], checked));
+    dispatch(clearTimeline('limited'));
+  },
+
+  onSave () {
+    dispatch(saveSettings());
+  },
+
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
diff --git a/app/javascript/mastodon/features/limited_timeline/index.js b/app/javascript/mastodon/features/limited_timeline/index.js
new file mode 100644
index 00000000000000..9ba82893678ca4
--- /dev/null
+++ b/app/javascript/mastodon/features/limited_timeline/index.js
@@ -0,0 +1,109 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { expandLimitedTimeline } from '../../actions/timelines';
+import PropTypes from 'prop-types';
+import StatusListContainer from '../ui/containers/status_list_container';
+import Column from '../../components/column';
+import ColumnHeader from '../../components/column_header';
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { getLimitedVisibilities } from 'mastodon/selectors';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ColumnSettingsContainer from './containers/column_settings_container';
+
+const messages = defineMessages({
+  title: { id: 'column.limited', defaultMessage: 'Limited' },
+});
+
+const mapStateToProps = state => ({
+  hasUnread: state.getIn(['timelines', 'limited', 'unread']) > 0,
+  visibilities: getLimitedVisibilities(state),
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class LimitedTimeline extends React.PureComponent {
+
+  static propTypes = {
+    dispatch: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    hasUnread: PropTypes.bool,
+    visibilities: PropTypes.arrayOf(PropTypes.string),
+    columnId: PropTypes.string,
+    multiColumn: PropTypes.bool,
+  };
+
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('LIMITED', {}));
+    }
+  }
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  }
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  }
+
+  setRef = c => {
+    this.column = c;
+  }
+
+  handleLoadMore = maxId => {
+    const { dispatch, visibilities } = this.props;
+
+    dispatch(expandLimitedTimeline({ maxId, visibilities }));
+  }
+
+  componentDidMount () {
+    const { dispatch, visibilities } = this.props;
+
+    dispatch(expandLimitedTimeline({ visibilities }));
+  }
+
+  componentDidUpdate (prevProps) {
+    const { dispatch, visibilities } = this.props;
+
+    if (prevProps.visibilities.toString() !== visibilities.toString()) {
+      dispatch(expandLimitedTimeline({ visibilities }));
+    }
+  }
+
+  render () {
+    const { intl, hasUnread, columnId, multiColumn } = this.props;
+    const pinned = !!columnId;
+
+    return (
+      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
+        <ColumnHeader
+          icon='lock'
+          active={hasUnread}
+          title={intl.formatMessage(messages.title)}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+        >
+          <ColumnSettingsContainer />
+        </ColumnHeader>
+
+        <StatusListContainer
+          trackScroll={!pinned}
+          scrollKey={`limited_timeline-${columnId}`}
+          onLoadMore={this.handleLoadMore}
+          timelineId='limited'
+          emptyMessage={<FormattedMessage id='empty_column.limited' defaultMessage='Your limited timeline is empty.' />}
+          bindToDocument={!multiColumn}
+        />
+      </Column>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 193637113abb44..bf3b57d9298f53 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -1,19 +1,23 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import ReactSwipeableViews from 'react-swipeable-views';
-import TabsBar, { links, getIndex, getLink } from './tabs_bar';
-import { Link } from 'react-router-dom';
-
-import { disableSwiping } from 'mastodon/initial_state';
-
-import BundleContainer from '../containers/bundle_container';
-import ColumnLoading from './column_loading';
-import DrawerLoading from './drawer_loading';
-import BundleColumnError from './bundle_column_error';
+import React, { Fragment } from "react";
+import PropTypes from "prop-types";
+import { defineMessages, injectIntl } from "react-intl";
+import ImmutablePropTypes from "react-immutable-proptypes";
+import ImmutablePureComponent from "react-immutable-pure-component";
+
+import ReactSwipeableViews from "react-swipeable-views";
+import TabsBar, { links, getIndex, getLink } from "./tabs_bar";
+import { Link } from "react-router-dom";
+
+import {
+  disableSwiping,
+  place_tab_bar_at_bottom,
+  enable_limited_timeline,
+} from "mastodon/initial_state";
+
+import BundleContainer from "../containers/bundle_container";
+import ColumnLoading from "./column_loading";
+import DrawerLoading from "./drawer_loading";
+import BundleColumnError from "./bundle_column_error";
 import {
   Compose,
   Notifications,
@@ -22,47 +26,55 @@ import {
   PublicTimeline,
   HashtagTimeline,
   DirectTimeline,
+  LimitedTimeline,
   FavouritedStatuses,
   BookmarkedStatuses,
   ListTimeline,
   Directory,
-} from '../../ui/util/async-components';
-import Icon from 'mastodon/components/icon';
-import ComposePanel from './compose_panel';
-import NavigationPanel from './navigation_panel';
+} from "../../ui/util/async-components";
+import Icon from "mastodon/components/icon";
+import ComposePanel from "./compose_panel";
+import NavigationPanel from "./navigation_panel";
+import { show_navigation_panel } from "mastodon/initial_state";
+import { removeColumn } from "mastodon/actions/columns";
 
-import { supportsPassiveEvents } from 'detect-passive-events';
-import { scrollRight } from '../../../scroll';
+import { supportsPassiveEvents } from "detect-passive-events";
+import { scrollRight } from "../../../scroll";
 
 const componentMap = {
-  'COMPOSE': Compose,
-  'HOME': HomeTimeline,
-  'NOTIFICATIONS': Notifications,
-  'PUBLIC': PublicTimeline,
-  'REMOTE': PublicTimeline,
-  'COMMUNITY': CommunityTimeline,
-  'HASHTAG': HashtagTimeline,
-  'DIRECT': DirectTimeline,
-  'FAVOURITES': FavouritedStatuses,
-  'BOOKMARKS': BookmarkedStatuses,
-  'LIST': ListTimeline,
-  'DIRECTORY': Directory,
+  COMPOSE: Compose,
+  HOME: HomeTimeline,
+  NOTIFICATIONS: Notifications,
+  PUBLIC: PublicTimeline,
+  REMOTE: PublicTimeline,
+  COMMUNITY: CommunityTimeline,
+  HASHTAG: HashtagTimeline,
+  DIRECT: DirectTimeline,
+  LIMITED: LimitedTimeline,
+  FAVOURITES: FavouritedStatuses,
+  BOOKMARKS: BookmarkedStatuses,
+  LIST: ListTimeline,
+  DIRECTORY: Directory,
 };
 
 const messages = defineMessages({
-  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
+  publish: { id: "compose_form.publish", defaultMessage: "Toot" },
 });
 
-const shouldHideFAB = path => path.match(/^\/statuses\/|^\/@[^/]+\/\d+|^\/publish|^\/search|^\/getting-started|^\/start/);
+const shouldHideFAB = (path) =>
+  path.match(
+    /^\/statuses\/|^\/@[^/]+\/\d+|^\/publish|^\/search|^\/getting-started|^\/start/
+  );
 
-export default @(component => injectIntl(component, { withRef: true }))
+export default
+@((component) => injectIntl(component, { withRef: true }))
 class ColumnsArea extends ImmutablePureComponent {
-
   static contextTypes = {
     router: PropTypes.object.isRequired,
   };
 
   static propTypes = {
+    dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     columns: ImmutablePropTypes.list.isRequired,
     isModalOpen: PropTypes.bool.isRequired,
@@ -70,49 +82,81 @@ class ColumnsArea extends ImmutablePureComponent {
     children: PropTypes.node,
   };
 
-   // Corresponds to (max-width: 600px + (285px * 1) + (10px * 1)) in SCSS
-   mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 895px)');
+  // Corresponds to (max-width: 600px + (285px * 1) + (10px * 1)) in SCSS
+  mediaQuery =
+    "matchMedia" in window && window.matchMedia("(max-width: 895px)");
 
   state = {
     shouldAnimate: false,
     renderComposePanel: !(this.mediaQuery && this.mediaQuery.matches),
-  }
+  };
 
   componentWillReceiveProps() {
-    if (typeof this.pendingIndex !== 'number' && this.lastIndex !== getIndex(this.context.router.history.location.pathname)) {
+    if (
+      typeof this.pendingIndex !== "number" &&
+      this.lastIndex !== getIndex(this.context.router.history.location.pathname)
+    ) {
       this.setState({ shouldAnimate: false });
     }
   }
 
   componentDidMount() {
+    const { dispatch, columns } = this.props;
+
     if (!this.props.singleColumn) {
-      this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
+      this.node.addEventListener(
+        "wheel",
+        this.handleWheel,
+        supportsPassiveEvents ? { passive: true } : false
+      );
     }
 
     if (this.mediaQuery) {
       if (this.mediaQuery.addEventListener) {
-        this.mediaQuery.addEventListener('change', this.handleLayoutChange);
+        this.mediaQuery.addEventListener("change", this.handleLayoutChange);
       } else {
         this.mediaQuery.addListener(this.handleLayoutChange);
       }
       this.setState({ renderComposePanel: !this.mediaQuery.matches });
     }
 
-    this.lastIndex   = getIndex(this.context.router.history.location.pathname);
-    this.isRtlLayout = document.getElementsByTagName('body')[0].classList.contains('rtl');
+    this.lastIndex = getIndex(this.context.router.history.location.pathname);
+    this.isRtlLayout = document
+      .getElementsByTagName("body")[0]
+      .classList.contains("rtl");
 
     this.setState({ shouldAnimate: true });
+
+    if (!enable_limited_timeline) {
+      const limitedColumn = columns.find(
+        (item) => item.get("id") === "LIMITED"
+      );
+
+      if (limitedColumn) {
+        dispatch(removeColumn(limitedColumn.get("uuid")));
+      }
+    }
   }
 
   componentWillUpdate(nextProps) {
-    if (this.props.singleColumn !== nextProps.singleColumn && nextProps.singleColumn) {
-      this.node.removeEventListener('wheel', this.handleWheel);
+    if (
+      this.props.singleColumn !== nextProps.singleColumn &&
+      nextProps.singleColumn
+    ) {
+      this.node.removeEventListener("wheel", this.handleWheel);
     }
   }
 
   componentDidUpdate(prevProps) {
-    if (this.props.singleColumn !== prevProps.singleColumn && !this.props.singleColumn) {
-      this.node.addEventListener('wheel', this.handleWheel, supportsPassiveEvents ? { passive: true } : false);
+    if (
+      this.props.singleColumn !== prevProps.singleColumn &&
+      !this.props.singleColumn
+    ) {
+      this.node.addEventListener(
+        "wheel",
+        this.handleWheel,
+        supportsPassiveEvents ? { passive: true } : false
+      );
     }
 
     const newIndex = getIndex(this.context.router.history.location.pathname);
@@ -123,14 +167,14 @@ class ColumnsArea extends ImmutablePureComponent {
     }
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     if (!this.props.singleColumn) {
-      this.node.removeEventListener('wheel', this.handleWheel);
+      this.node.removeEventListener("wheel", this.handleWheel);
     }
 
     if (this.mediaQuery) {
       if (this.mediaQuery.removeEventListener) {
-        this.mediaQuery.removeEventListener('change', this.handleLayoutChange);
+        this.mediaQuery.removeEventListener("change", this.handleLayoutChange);
       } else {
         this.mediaQuery.removeListener(this.handleLayouteChange);
       }
@@ -140,107 +184,144 @@ class ColumnsArea extends ImmutablePureComponent {
   handleChildrenContentChange() {
     if (!this.props.singleColumn) {
       const modifier = this.isRtlLayout ? -1 : 1;
-      this._interruptScrollAnimation = scrollRight(this.node, (this.node.scrollWidth - window.innerWidth) * modifier);
+      this._interruptScrollAnimation = scrollRight(
+        this.node,
+        (this.node.scrollWidth - window.innerWidth) * modifier
+      );
     }
   }
 
   handleLayoutChange = (e) => {
     this.setState({ renderComposePanel: !e.matches });
-  }
+  };
 
   handleSwipe = (index) => {
     this.pendingIndex = index;
 
-    const nextLinkTranslationId = links[index].props['data-preview-title-id'];
-    const currentLinkSelector = '.tabs-bar__link.active';
+    const nextLinkTranslationId = links[index].props["data-preview-title-id"];
+    const currentLinkSelector = ".tabs-bar__link.active";
     const nextLinkSelector = `.tabs-bar__link[data-preview-title-id="${nextLinkTranslationId}"]`;
 
     // HACK: Remove the active class from the current link and set it to the next one
     // React-router does this for us, but too late, feeling laggy.
-    document.querySelector(currentLinkSelector).classList.remove('active');
-    document.querySelector(nextLinkSelector).classList.add('active');
+    document.querySelector(currentLinkSelector).classList.remove("active");
+    document.querySelector(nextLinkSelector).classList.add("active");
 
-    if (!this.state.shouldAnimate && typeof this.pendingIndex === 'number') {
+    if (!this.state.shouldAnimate && typeof this.pendingIndex === "number") {
       this.context.router.history.push(getLink(this.pendingIndex));
       this.pendingIndex = null;
     }
-  }
+  };
 
   handleAnimationEnd = () => {
-    if (typeof this.pendingIndex === 'number') {
+    if (typeof this.pendingIndex === "number") {
       this.context.router.history.push(getLink(this.pendingIndex));
       this.pendingIndex = null;
     }
-  }
+  };
 
   handleWheel = () => {
-    if (typeof this._interruptScrollAnimation !== 'function') {
+    if (typeof this._interruptScrollAnimation !== "function") {
       return;
     }
 
     this._interruptScrollAnimation();
-  }
+  };
 
   setRef = (node) => {
     this.node = node;
-  }
+  };
 
   renderView = (link, index) => {
     const columnIndex = getIndex(this.context.router.history.location.pathname);
-    const title = this.props.intl.formatMessage({ id: link.props['data-preview-title-id'] });
-    const icon = link.props['data-preview-icon'];
-
-    const view = (index === columnIndex) ?
-      React.cloneElement(this.props.children) :
-      <ColumnLoading title={title} icon={icon} />;
+    const title = this.props.intl.formatMessage({
+      id: link.props["data-preview-title-id"],
+    });
+    const icon = link.props["data-preview-icon"];
+
+    const view =
+      index === columnIndex ? (
+        React.cloneElement(this.props.children)
+      ) : (
+        <ColumnLoading title={title} icon={icon} />
+      );
 
     return (
-      <div className='columns-area columns-area--mobile' key={index}>
+      <div className="columns-area columns-area--mobile" key={index}>
         {view}
       </div>
     );
-  }
+  };
 
-  renderLoading = columnId => () => {
-    return columnId === 'COMPOSE' ? <DrawerLoading /> : <ColumnLoading />;
-  }
+  renderLoading = (columnId) => () => {
+    return columnId === "COMPOSE" ? <DrawerLoading /> : <ColumnLoading />;
+  };
 
   renderError = (props) => {
     return <BundleColumnError {...props} />;
-  }
+  };
 
-  render () {
+  render() {
     const { columns, children, singleColumn, isModalOpen, intl } = this.props;
     const { shouldAnimate, renderComposePanel } = this.state;
 
     const columnIndex = getIndex(this.context.router.history.location.pathname);
 
     if (singleColumn) {
-      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/publish' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
-
-      const content = columnIndex !== -1 ? (
-        <ReactSwipeableViews key='content' hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={disableSwiping}>
-          {links.map(this.renderView)}
-        </ReactSwipeableViews>
-      ) : (
-        <div key='content' className='columns-area columns-area--mobile'>{children}</div>
+      const floatingActionButton = shouldHideFAB(
+        this.context.router.history.location.pathname
+      ) ? null : (
+        <Link
+          key="floating-action-button"
+          to="/publish"
+          className="floating-action-button"
+          aria-label={intl.formatMessage(messages.publish)}
+        >
+          <Icon id="pencil" />
+        </Link>
       );
 
+      const content =
+        columnIndex !== -1 ? (
+          <ReactSwipeableViews
+            key="content"
+            hysteresis={0.2}
+            threshold={15}
+            index={columnIndex}
+            onChangeIndex={this.handleSwipe}
+            onTransitionEnd={this.handleAnimationEnd}
+            animateTransitions={shouldAnimate}
+            springConfig={{
+              duration: "400ms",
+              delay: "0s",
+              easeFunction: "ease",
+            }}
+            style={{ height: "100%" }}
+            disabled={disableSwiping}
+          >
+            {links.map(this.renderView)}
+          </ReactSwipeableViews>
+        ) : (
+          <div key="content" className="columns-area columns-area--mobile">
+            {children}
+          </div>
+        );
+
       return (
-        <div className='columns-area__panels'>
-          <div className='columns-area__panels__pane columns-area__panels__pane--compositional'>
-            <div className='columns-area__panels__pane__inner'>
+        <div className="columns-area__panels">
+          <div className="columns-area__panels__pane columns-area__panels__pane--compositional">
+            <div className="columns-area__panels__pane__inner">
               {renderComposePanel && <ComposePanel />}
             </div>
           </div>
 
-          <div className='columns-area__panels__main'>
-            <TabsBar key='tabs' />
+          <div className="columns-area__panels__main">
+            <TabsBar key="tabs" />
             {content}
           </div>
 
-          <div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'>
-            <div className='columns-area__panels__pane__inner'>
+          <div className="columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational">
+            <div className="columns-area__panels__pane__inner">
               <NavigationPanel />
             </div>
           </div>
@@ -251,21 +332,40 @@ class ColumnsArea extends ImmutablePureComponent {
     }
 
     return (
-      <div className={`columns-area ${ isModalOpen ? 'unscrollable' : '' }`} ref={this.setRef}>
-        {columns.map(column => {
-          const params = column.get('params', null) === null ? null : column.get('params').toJS();
-          const other  = params && params.other ? params.other : {};
+      <div
+        className={`columns-area ${isModalOpen ? "unscrollable" : ""}`}
+        ref={this.setRef}
+      >
+        {columns.map((column) => {
+          const params =
+            column.get("params", null) === null
+              ? null
+              : column.get("params").toJS();
+          const other = params && params.other ? params.other : {};
 
           return (
-            <BundleContainer key={column.get('uuid')} fetchComponent={componentMap[column.get('id')]} loading={this.renderLoading(column.get('id'))} error={this.renderError}>
-              {SpecificComponent => <SpecificComponent columnId={column.get('uuid')} params={params} multiColumn {...other} />}
+            <BundleContainer
+              key={column.get("uuid")}
+              fetchComponent={componentMap[column.get("id")]}
+              loading={this.renderLoading(column.get("id"))}
+              error={this.renderError}
+            >
+              {(SpecificComponent) => (
+                <SpecificComponent
+                  columnId={column.get("uuid")}
+                  params={params}
+                  multiColumn
+                  {...other}
+                />
+              )}
             </BundleContainer>
           );
         })}
 
-        {React.Children.map(children, child => React.cloneElement(child, { multiColumn: true }))}
+        {React.Children.map(children, (child) =>
+          React.cloneElement(child, { multiColumn: true })
+        )}
       </div>
     );
   }
-
 }
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index 74f6aa4372eca2..aacddd429a08e9 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -2,23 +2,43 @@ import React from "react";
 import { NavLink, withRouter } from "react-router-dom";
 import { FormattedMessage } from "react-intl";
 import Icon from "mastodon/components/icon";
-import { profile_directory, showTrends } from "mastodon/initial_state";
+import {
+  profile_directory,
+  showTrends,
+  enable_limited_timeline,
+} from "mastodon/initial_state";
 import NotificationsCounterIcon from "./notifications_counter_icon";
 import FollowRequestsNavLink from "./follow_requests_nav_link";
 import ListPanel from "./list_panel";
+import FavouriteDomainPanel from "./favourite_domain_panel";
+import FavouriteTagPanel from "./favourite_tag_panel";
 import TrendsContainer from "mastodon/features/getting_started/containers/trends_container";
 
 const NavigationPanel = () => (
   <div className="navigation-panel">
     <NavLink
       className="column-link column-link--transparent"
-      to="/home"
+      to="/timelines/home"
       data-preview-title-id="column.home"
       data-preview-icon="home"
     >
       <Icon className="column-link__icon" id="home" fixedWidth />
       <FormattedMessage id="tabs_bar.home" defaultMessage="Home" />
     </NavLink>
+    {enable_limited_timeline && (
+      <NavLink
+        className="column-link column-link--transparent"
+        to="/timelines/limited"
+        data-preview-title-id="column.limited"
+        data-preview-icon="lock"
+      >
+        <Icon className="column-link__icon" id="lock" fixedWidth />
+        <FormattedMessage
+          id="navigation_bar.limited_timeline"
+          defaultMessage="Limited home"
+        />
+      </NavLink>
+    )}
     <NavLink
       className="column-link column-link--transparent"
       to="/notifications"
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index a023bcf34124e7..706e738d564684 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -1,41 +1,197 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { NavLink, withRouter } from 'react-router-dom';
-import { FormattedMessage, injectIntl } from 'react-intl';
-import { debounce } from 'lodash';
-import { isUserTouching } from '../../../is_mobile';
-import Icon from 'mastodon/components/icon';
-import NotificationsCounterIcon from './notifications_counter_icon';
-
-export const links = [
-  <NavLink className='tabs-bar__link' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
-  <NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
-  <NavLink className='tabs-bar__link' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
-  <NavLink className='tabs-bar__link' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
-  <NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
-  <NavLink className='tabs-bar__link' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
+import React from "react";
+import PropTypes from "prop-types";
+import { NavLink, withRouter } from "react-router-dom";
+import { FormattedMessage, injectIntl } from "react-intl";
+import { debounce } from "lodash";
+import { isUserTouching } from "../../../is_mobile";
+import Icon from "mastodon/components/icon";
+import NotificationsCounterIcon from "./notifications_counter_icon";
+import {
+  place_tab_bar_at_bottom,
+  show_tab_bar_label,
+  enable_limited_timeline,
+} from "mastodon/initial_state";
+import classNames from "classnames";
+
+const links = [
+  <NavLink
+    className="tabs-bar__link"
+    to="/timelines/home"
+    data-preview-title-id="column.home"
+    data-preview-icon="home"
+  >
+    <Icon id="home" fixedWidth />
+    <span className="tabs-bar__link__full-label">
+      <FormattedMessage id="tabs_bar.home" defaultMessage="Home" />
+    </span>
+    <span className="tabs-bar__link__short-label">
+      <FormattedMessage id="navigation_bar.short.home" defaultMessage="Home" />
+    </span>
+  </NavLink>,
+  <NavLink
+    className="tabs-bar__link tabs-bar__limited"
+    to="/timelines/limited"
+    data-preview-title-id="column.limited"
+    data-preview-icon="lock"
+  >
+    <Icon id="lock" fixedWidth />
+    <span className="tabs-bar__link__full-label">
+      <FormattedMessage
+        id="tabs_bar.limited_timeline"
+        defaultMessage="Limited"
+      />
+    </span>
+    <span className="tabs-bar__link__short-label">
+      <FormattedMessage
+        id="navigation_bar.short.limited_timeline"
+        defaultMessage="Ltd."
+      />
+    </span>
+  </NavLink>,
+  <NavLink
+    className="tabs-bar__link"
+    to="/notifications"
+    data-preview-title-id="column.notifications"
+    data-preview-icon="bell"
+  >
+    <NotificationsCounterIcon />
+    <span className="tabs-bar__link__full-label">
+      <FormattedMessage
+        id="tabs_bar.notifications"
+        defaultMessage="Notifications"
+      />
+    </span>
+    <span className="tabs-bar__link__short-label">
+      <FormattedMessage
+        id="navigation_bar.short.notifications"
+        defaultMessage="Notif."
+      />
+    </span>
+  </NavLink>,
+  <NavLink
+    className="tabs-bar__link"
+    to="/timelines/public/local"
+    data-preview-title-id="column.community"
+    data-preview-icon="users"
+  >
+    <Icon id="users" fixedWidth />
+    <span className="tabs-bar__link__full-label">
+      <FormattedMessage id="tabs_bar.local_timeline" defaultMessage="Local" />
+    </span>
+    <span className="tabs-bar__link__short-label">
+      <FormattedMessage
+        id="navigation_bar.short.community_timeline"
+        defaultMessage="LTL"
+      />
+    </span>
+  </NavLink>,
+  <NavLink
+    className="tabs-bar__link"
+    exact
+    to="/timelines/public"
+    data-preview-title-id="column.public"
+    data-preview-icon="globe"
+  >
+    <Icon id="globe" fixedWidth />
+    <span className="tabs-bar__link__full-label">
+      <FormattedMessage
+        id="tabs_bar.federated_timeline"
+        defaultMessage="Federated"
+      />
+    </span>
+    <span className="tabs-bar__link__short-label">
+      <FormattedMessage
+        id="navigation_bar.short.public_timeline"
+        defaultMessage="FTL"
+      />
+    </span>
+  </NavLink>,
+  <NavLink
+    className="tabs-bar__link"
+    exact
+    to="/lists"
+    data-preview-title-id="column.lists"
+    data-preview-icon="list-ul"
+  >
+    <Icon id="list-ul" fixedWidth />
+    <span className="tabs-bar__link__full-label">
+      <FormattedMessage id="tabs_bar.lists" defaultMessage="Lists" />
+    </span>
+    <span className="tabs-bar__link__short-label">
+      <FormattedMessage id="navigation_bar.short.lists" defaultMessage="List" />
+    </span>
+  </NavLink>,
+  <NavLink
+    className="tabs-bar__link optional"
+    to="/search"
+    data-preview-title-id="tabs_bar.search"
+    data-preview-icon="bell"
+  >
+    <Icon id="search" fixedWidth />
+    <span className="tabs-bar__link__full-label">
+      <FormattedMessage id="tabs_bar.search" defaultMessage="Search" />
+    </span>
+    <span className="tabs-bar__link__short-label">
+      <FormattedMessage
+        id="navigation_bar.short.search"
+        defaultMessage="Search"
+      />
+    </span>
+  </NavLink>,
+  // <a className='tabs-bar__external-link' href='/settings/preferences' to='/settings/preferences' data-preview-title-id='navigation_bar.preferences' data-preview-icon='cog' ><Icon id='cog' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='navigation_bar.preferences' defaultMessage='Preferences' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.preferences' defaultMessage='Pref.' /></span></a>,
+  // <a className='tabs-bar__external-link' href='/auth/sign_out' to='/auth/sign_out' data-method='delete' data-preview-title-id='navigation_bar.logout' data-preview-icon='sign-out' ><Icon id='sign-out' fixedWidth /><span className='tabs-bar__link__full-label'><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></span><span className='tabs-bar__link__short-label'><FormattedMessage id='navigation_bar.short.logout' defaultMessage='Logout' /></span></a>,
+  <NavLink
+    className="tabs-bar__link hamburger"
+    to="/getting-started"
+    data-preview-title-id="getting_started.heading"
+    data-preview-icon="bars"
+  >
+    <Icon id="bars" fixedWidth />
+  </NavLink>,
 ];
 
-export function getIndex (path) {
-  return links.findIndex(link => link.props.to === path);
+export const getLinks = memoize(() => {
+  return links.filter((link) => {
+    const classes = link.props.className.split(/\s+/);
+    return !(!enable_limited_timeline && classes.includes("tabs-bar__limited"));
+  });
+});
+
+export const getSwipeableLinks = memoize(() => {
+  return getLinks().filter((link) => {
+    const classes = link.props.className.split(/\s+/);
+    return classes.includes("tabs-bar__link");
+  });
+});
+
+export function getSwipeableIndex(path) {
+  return getSwipeableLinks().findIndex((link) => link.props.to === path);
+}
+
+export function getSwipeableLink(index) {
+  return getSwipeableLinks()[index].props.to;
+}
+
+export function getIndex(path) {
+  return getLinks().findIndex((link) => link.props.to === path);
 }
 
-export function getLink (index) {
-  return links[index].props.to;
+export function getLink(index) {
+  return getLinks()[index].props.to;
 }
 
-export default @injectIntl
+export default
+@injectIntl
 @withRouter
 class TabsBar extends React.PureComponent {
-
   static propTypes = {
     intl: PropTypes.object.isRequired,
     history: PropTypes.object.isRequired,
-  }
+  };
 
-  setRef = ref => {
+  setRef = (ref) => {
     this.node = ref;
-  }
+  };
 
   handleClick = (e) => {
     // Only apply optimization for touch devices, which we assume are slower
@@ -45,42 +201,59 @@ class TabsBar extends React.PureComponent {
       e.persist();
 
       requestAnimationFrame(() => {
-        const tabs = Array(...this.node.querySelectorAll('.tabs-bar__link'));
-        const currentTab = tabs.find(tab => tab.classList.contains('active'));
-        const nextTab = tabs.find(tab => tab.contains(e.target));
-        const { props: { to } } = links[Array(...this.node.childNodes).indexOf(nextTab)];
-
+        const tabs = Array(...this.node.querySelectorAll(".tabs-bar__link"));
+        const currentTab = tabs.find((tab) => tab.classList.contains("active"));
+        const nextTab = tabs.find((tab) => tab.contains(e.target));
+        const {
+          props: { to },
+        } = getLinks()[Array(...this.node.childNodes).indexOf(nextTab)];
 
         if (currentTab !== nextTab) {
           if (currentTab) {
-            currentTab.classList.remove('active');
+            currentTab.classList.remove("active");
           }
 
           const listener = debounce(() => {
-            nextTab.removeEventListener('transitionend', listener);
+            nextTab.removeEventListener("transitionend", listener);
             this.props.history.push(to);
           }, 50);
 
-          nextTab.addEventListener('transitionend', listener);
-          nextTab.classList.add('active');
+          nextTab.addEventListener("transitionend", listener);
+          nextTab.classList.add("active");
         }
       });
     }
+  };
 
-  }
-
-  render () {
-    const { intl: { formatMessage } } = this.props;
+  render() {
+    const {
+      intl: { formatMessage },
+    } = this.props;
 
     return (
-      <div className='tabs-bar__wrapper'>
-        <nav className='tabs-bar' ref={this.setRef}>
-          {links.map(link => React.cloneElement(link, { key: link.props.to, onClick: this.handleClick, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
+      <div className="tabs-bar__wrapper">
+        <nav
+          className={classNames("tabs-bar", {
+            "bottom-bar": place_tab_bar_at_bottom,
+          })}
+          ref={this.setRef}
+        >
+          {getLinks().map((link) =>
+            React.cloneElement(link, {
+              key: link.props.to,
+              className: classNames(link.props.className, {
+                "short-label": show_tab_bar_label,
+              }),
+              onClick: link.props.href ? null : this.handleClick,
+              "aria-label": formatMessage({
+                id: link.props["data-preview-title-id"],
+              }),
+            })
+          )}
         </nav>
 
-        <div id='tabs-bar__portal' />
+        <div id="tabs-bar__portal" />
       </div>
     );
   }
-
 }
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 4ce4ac6c8c94c4..cc90423f4197aa 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 import StatusList from '../../../components/status_list';
 import { scrollTopTimeline, loadPending } from '../../../actions/timelines';
+import { getHomeVisibilities, getLimitedVisibilities } from 'mastodon/selectors';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import { createSelector } from 'reselect';
 import { debounce } from 'lodash';
@@ -8,16 +9,21 @@ import { me } from '../../../initial_state';
 
 const makeGetStatusIds = (pending = false) => createSelector([
   (state, { type }) => state.getIn(['settings', type], ImmutableMap()),
+  (state, { type }) => type === 'home' ? getHomeVisibilities(state) : type === 'limited' ? getLimitedVisibilities(state) : [],
   (state, { type }) => state.getIn(['timelines', type, pending ? 'pendingItems' : 'items'], ImmutableList()),
   (state)           => state.get('statuses'),
-], (columnSettings, statusIds, statuses) => {
+], (columnSettings, visibilities, statusIds, statuses) => {
   return statusIds.filter(id => {
     if (id === null) return true;
 
     const statusForId = statuses.get(id);
     let showStatus    = true;
 
-    if (statusForId.get('account') === me) return true;
+    if (visibilities.length) {
+      showStatus = showStatus && visibilities.includes(statusForId.get('visibility'));
+    }
+
+    if (statusForId.get('account') === me) return showStatus;
 
     if (columnSettings.getIn(['shows', 'reblog']) === false) {
       showStatus = showStatus && statusForId.get('reblog') === null;
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 61ce9d63778482..077a3b6c5a954a 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -1,27 +1,36 @@
-import classNames from 'classnames';
-import React from 'react';
-import { HotKeys } from 'react-hotkeys';
-import { defineMessages, injectIntl } from 'react-intl';
-import { connect } from 'react-redux';
-import { Redirect, withRouter } from 'react-router-dom';
-import PropTypes from 'prop-types';
-import NotificationsContainer from './containers/notifications_container';
-import LoadingBarContainer from './containers/loading_bar_container';
-import ModalContainer from './containers/modal_container';
-import { layoutFromWindow } from 'mastodon/is_mobile';
-import { debounce } from 'lodash';
-import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
-import { expandHomeTimeline } from '../../actions/timelines';
-import { expandNotifications } from '../../actions/notifications';
-import { fetchFilters } from '../../actions/filters';
-import { clearHeight } from '../../actions/height_cache';
-import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
-import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
-import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
-import UploadArea from './components/upload_area';
-import ColumnsAreaContainer from './containers/columns_area_container';
-import DocumentTitle from './components/document_title';
-import PictureInPicture from 'mastodon/features/picture_in_picture';
+import classNames from "classnames";
+import React from "react";
+import { HotKeys } from "react-hotkeys";
+import { defineMessages, injectIntl } from "react-intl";
+import { connect } from "react-redux";
+import { Redirect, withRouter } from "react-router-dom";
+import PropTypes from "prop-types";
+import NotificationsContainer from "./containers/notifications_container";
+import LoadingBarContainer from "./containers/loading_bar_container";
+import ModalContainer from "./containers/modal_container";
+import { layoutFromWindow } from "mastodon/is_mobile";
+import { debounce } from "lodash";
+import {
+  uploadCompose,
+  resetCompose,
+  changeComposeSpoilerness,
+} from "../../actions/compose";
+import { expandHomeTimeline } from "../../actions/timelines";
+import { expandNotifications } from "../../actions/notifications";
+import { fetchFilters } from "../../actions/filters";
+import { clearHeight } from "../../actions/height_cache";
+import { focusApp, unfocusApp, changeLayout } from "mastodon/actions/app";
+import {
+  synchronouslySubmitMarkers,
+  submitMarkers,
+  fetchMarkers,
+} from "mastodon/actions/markers";
+import { getHomeVisibilities } from "mastodon/selectors";
+import { WrappedSwitch, WrappedRoute } from "./util/react_router_helpers";
+import UploadArea from "./components/upload_area";
+import ColumnsAreaContainer from "./containers/columns_area_container";
+import DocumentTitle from "./components/document_title";
+import PictureInPicture from "mastodon/features/picture_in_picture";
 import {
   Compose,
   Status,
@@ -38,6 +47,7 @@ import {
   Favourites,
   Mentions,
   DirectTimeline,
+  LimitedTimeline,
   HashtagTimeline,
   Notifications,
   FollowRequests,
@@ -54,162 +64,363 @@ import {
   Search,
   Directory,
   FollowRecommendations,
-} from './util/async-components';
-import { me } from '../../initial_state';
-import { closeOnboarding, INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
+} from "./util/async-components";
+import { me } from "../../initial_state";
+import {
+  closeOnboarding,
+  INTRODUCTION_VERSION,
+} from "mastodon/actions/onboarding";
 
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
-import '../../components/status';
+import "../../components/status";
 
 const messages = defineMessages({
-  beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Mastodon.' },
+  beforeUnload: {
+    id: "ui.beforeunload",
+    defaultMessage: "Your draft will be lost if you leave Mastodon.",
+  },
 });
 
-const mapStateToProps = state => ({
-  layout: state.getIn(['meta', 'layout']),
-  isComposing: state.getIn(['compose', 'is_composing']),
-  hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
-  hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
-  canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
-  dropdownMenuIsOpen: state.getIn(['dropdown_menu', 'openId']) !== null,
-  firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
-  username: state.getIn(['accounts', me, 'username']),
+const mapStateToProps = (state) => ({
+  layout: state.getIn(["meta", "layout"]),
+  isComposing: state.getIn(["compose", "is_composing"]),
+  hasComposingText: state.getIn(["compose", "text"]).trim().length !== 0,
+  hasMediaAttachments: state.getIn(["compose", "media_attachments"]).size > 0,
+  canUploadMore:
+    !state
+      .getIn(["compose", "media_attachments"])
+      .some((x) => ["audio", "video"].includes(x.get("type"))) &&
+    state.getIn(["compose", "media_attachments"]).size < 4,
+  dropdownMenuIsOpen: state.getIn(["dropdown_menu", "openId"]) !== null,
+  firstLaunch:
+    state.getIn(["settings", "introductionVersion"], 0) < INTRODUCTION_VERSION,
+  visibilities: getHomeVisibilities(state),
 });
 
 const keyMap = {
-  help: '?',
-  new: 'n',
-  search: 's',
-  forceNew: 'option+n',
-  toggleComposeSpoilers: 'option+x',
-  focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
-  reply: 'r',
-  favourite: 'f',
-  boost: 'b',
-  mention: 'm',
-  open: ['enter', 'o'],
-  openProfile: 'p',
-  moveDown: ['down', 'j'],
-  moveUp: ['up', 'k'],
-  back: 'backspace',
-  goToHome: 'g h',
-  goToNotifications: 'g n',
-  goToLocal: 'g l',
-  goToFederated: 'g t',
-  goToDirect: 'g d',
-  goToStart: 'g s',
-  goToFavourites: 'g f',
-  goToPinned: 'g p',
-  goToProfile: 'g u',
-  goToBlocked: 'g b',
-  goToMuted: 'g m',
-  goToRequests: 'g r',
-  toggleHidden: 'x',
-  toggleSensitive: 'h',
-  openMedia: 'e',
+  help: "?",
+  new: "n",
+  search: "s",
+  forceNew: "option+n",
+  toggleComposeSpoilers: "option+x",
+  focusColumn: ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
+  reply: "r",
+  favourite: "f",
+  boost: "b",
+  mention: "m",
+  open: ["enter", "o"],
+  openProfile: "p",
+  moveDown: ["down", "j"],
+  moveUp: ["up", "k"],
+  back: "backspace",
+  goToHome: "g h",
+  goToNotifications: "g n",
+  goToLocal: "g l",
+  goToFederated: "g t",
+  goToDirect: "g d",
+  goToStart: "g s",
+  goToFavourites: "g f",
+  goToPinned: "g p",
+  goToProfile: "g u",
+  goToBlocked: "g b",
+  goToMuted: "g m",
+  goToRequests: "g r",
+  toggleHidden: "x",
+  toggleSensitive: "h",
+  openMedia: "e",
 };
 
 class SwitchingColumnsArea extends React.PureComponent {
-
   static propTypes = {
     children: PropTypes.node,
     location: PropTypes.object,
     mobile: PropTypes.bool,
   };
 
-  componentWillMount () {
+  componentWillMount() {
     if (this.props.mobile) {
-      document.body.classList.toggle('layout-single-column', true);
-      document.body.classList.toggle('layout-multiple-columns', false);
+      document.body.classList.toggle("layout-single-column", true);
+      document.body.classList.toggle("layout-multiple-columns", false);
     } else {
-      document.body.classList.toggle('layout-single-column', false);
-      document.body.classList.toggle('layout-multiple-columns', true);
+      document.body.classList.toggle("layout-single-column", false);
+      document.body.classList.toggle("layout-multiple-columns", true);
     }
   }
 
-  componentDidUpdate (prevProps) {
-    if (![this.props.location.pathname, '/'].includes(prevProps.location.pathname)) {
+  componentDidUpdate(prevProps) {
+    if (
+      ![this.props.location.pathname, "/"].includes(prevProps.location.pathname)
+    ) {
       this.node.handleChildrenContentChange();
     }
 
     if (prevProps.mobile !== this.props.mobile) {
-      document.body.classList.toggle('layout-single-column', this.props.mobile);
-      document.body.classList.toggle('layout-multiple-columns', !this.props.mobile);
+      document.body.classList.toggle("layout-single-column", this.props.mobile);
+      document.body.classList.toggle(
+        "layout-multiple-columns",
+        !this.props.mobile
+      );
     }
   }
 
-  setRef = c => {
+  setRef = (c) => {
     if (c) {
       this.node = c.getWrappedInstance();
     }
-  }
+  };
 
-  render () {
+  render() {
     const { children, mobile } = this.props;
-    const redirect = mobile ? <Redirect from='/' to='/home' exact /> : <Redirect from='/' to='/getting-started' exact />;
+    const redirect = mobile ? (
+      <Redirect from="/" to="/home" exact />
+    ) : (
+      <Redirect from="/" to="/getting-started" exact />
+    );
 
     return (
       <ColumnsAreaContainer ref={this.setRef} singleColumn={mobile}>
         <WrappedSwitch>
           {redirect}
-          <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
-          <WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
-
-          <WrappedRoute path={['/home', '/timelines/home']} component={HomeTimeline} content={children} />
-          <WrappedRoute path={['/public', '/timelines/public']} exact component={PublicTimeline} content={children} />
-          <WrappedRoute path={['/public/local', '/timelines/public/local']} exact component={CommunityTimeline} content={children} />
-          <WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
-          <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
-          <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-          <WrappedRoute path='/notifications' component={Notifications} content={children} />
-          <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
-
-          <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
-          <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
-
-          <WrappedRoute path='/start' component={FollowRecommendations} content={children} />
-          <WrappedRoute path='/search' component={Search} content={children} />
-          <WrappedRoute path='/directory' component={Directory} content={children} />
-          <WrappedRoute path={['/publish', '/statuses/new']} component={Compose} content={children} />
-
-          <WrappedRoute path={['/@:acct', '/accounts/:id']} exact component={AccountTimeline} content={children} />
-          <WrappedRoute path={['/@:acct/with_replies', '/accounts/:id/with_replies']} component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
-          <WrappedRoute path={['/@:acct/followers', '/accounts/:id/followers']} component={Followers} content={children} />
-          <WrappedRoute path={['/@:acct/following', '/accounts/:id/following']} component={Following} content={children} />
-          <WrappedRoute path={['/@:acct/media', '/accounts/:id/media']} component={AccountGallery} content={children} />
-          <WrappedRoute path='/@:acct/:statusId' exact component={Status} content={children} />
-          <WrappedRoute path='/@:acct/:statusId/reblogs' component={Reblogs} content={children} />
-          <WrappedRoute path='/@:acct/:statusId/favourites' component={Favourites} content={children} />
+          <WrappedRoute
+            path="/getting-started"
+            component={GettingStarted}
+            content={children}
+          />
+          <WrappedRoute
+            path="/keyboard-shortcuts"
+            component={KeyboardShortcuts}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/home"
+            component={HomeTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/public"
+            exact
+            component={PublicTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/public/local"
+            exact
+            component={CommunityTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/public/domain/:domain"
+            exact
+            component={DomainTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/groups/:id/:tagged?"
+            exact
+            component={GroupTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/direct"
+            component={DirectTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/limited"
+            component={LimitedTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/tag/:id"
+            component={HashtagTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/list/:id"
+            component={ListTimeline}
+            content={children}
+          />
+
+          <WrappedRoute
+            path={["/home", "/timelines/home"]}
+            component={HomeTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path={["/public", "/timelines/public"]}
+            exact
+            component={PublicTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path={["/public/local", "/timelines/public/local"]}
+            exact
+            component={CommunityTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path={["/conversations", "/timelines/direct"]}
+            component={DirectTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/tags/:id"
+            component={HashtagTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/lists/:id"
+            component={ListTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/notifications"
+            component={Notifications}
+            content={children}
+          />
+          <WrappedRoute
+            path="/favourites"
+            component={FavouritedStatuses}
+            content={children}
+          />
+
+          <WrappedRoute
+            path="/bookmarks"
+            component={BookmarkedStatuses}
+            content={children}
+          />
+          <WrappedRoute
+            path="/pinned"
+            component={PinnedStatuses}
+            content={children}
+          />
+
+          <WrappedRoute
+            path="/start"
+            component={FollowRecommendations}
+            content={children}
+          />
+          <WrappedRoute path="/search" component={Search} content={children} />
+          <WrappedRoute
+            path="/directory"
+            component={Directory}
+            content={children}
+          />
+          <WrappedRoute
+            path={["/publish", "/statuses/new"]}
+            component={Compose}
+            content={children}
+          />
+
+          <WrappedRoute
+            path={["/@:acct", "/accounts/:id"]}
+            exact
+            component={AccountTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path={["/@:acct/with_replies", "/accounts/:id/with_replies"]}
+            component={AccountTimeline}
+            content={children}
+            componentParams={{ withReplies: true }}
+          />
+          <WrappedRoute
+            path={["/@:acct/followers", "/accounts/:id/followers"]}
+            component={Followers}
+            content={children}
+          />
+          <WrappedRoute
+            path={["/@:acct/following", "/accounts/:id/following"]}
+            component={Following}
+            content={children}
+          />
+          <WrappedRoute
+            path={["/@:acct/media", "/accounts/:id/media"]}
+            component={AccountGallery}
+            content={children}
+          />
+          <WrappedRoute
+            path="/@:acct/:statusId"
+            exact
+            component={Status}
+            content={children}
+          />
+          <WrappedRoute
+            path="/@:acct/:statusId/reblogs"
+            component={Reblogs}
+            content={children}
+          />
+          <WrappedRoute
+            path="/@:acct/:statusId/favourites"
+            component={Favourites}
+            content={children}
+          />
 
           {/* Legacy routes, cannot be easily factored with other routes because they share a param name */}
-          <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
-          <WrappedRoute path='/timelines/list/:id' component={ListTimeline} content={children} />
-          <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
-          <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} />
-          <WrappedRoute path='/statuses/:statusId/favourites' component={Favourites} content={children} />
-          <WrappedRoute path='/statuses/:statusId/mentions' component={Mentions} content={children} />
-
-          <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
-          <WrappedRoute path='/blocks' component={Blocks} content={children} />
-          <WrappedRoute path='/domain_blocks' component={DomainBlocks} content={children} />
-          <WrappedRoute path='/mutes' component={Mutes} content={children} />
-          <WrappedRoute path='/lists' component={Lists} content={children} />
-          <WrappedRoute path='/circles' component={Circles} content={children} />
+          <WrappedRoute
+            path="/timelines/tag/:id"
+            component={HashtagTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/timelines/list/:id"
+            component={ListTimeline}
+            content={children}
+          />
+          <WrappedRoute
+            path="/statuses/:statusId"
+            exact
+            component={Status}
+            content={children}
+          />
+          <WrappedRoute
+            path="/statuses/:statusId/reblogs"
+            component={Reblogs}
+            content={children}
+          />
+          <WrappedRoute
+            path="/statuses/:statusId/favourites"
+            component={Favourites}
+            content={children}
+          />
+          <WrappedRoute
+            path="/statuses/:statusId/mentions"
+            component={Mentions}
+            content={children}
+          />
+
+          <WrappedRoute
+            path="/follow_requests"
+            component={FollowRequests}
+            content={children}
+          />
+          <WrappedRoute path="/blocks" component={Blocks} content={children} />
+          <WrappedRoute
+            path="/domain_blocks"
+            component={DomainBlocks}
+            content={children}
+          />
+          <WrappedRoute path="/mutes" component={Mutes} content={children} />
+          <WrappedRoute path="/lists" component={Lists} content={children} />
+          <WrappedRoute
+            path="/circles"
+            component={Circles}
+            content={children}
+          />
 
           <WrappedRoute component={GenericNotFound} content={children} />
         </WrappedSwitch>
       </ColumnsAreaContainer>
     );
   }
-
 }
 
-export default @connect(mapStateToProps)
+export default
+@connect(mapStateToProps)
 @injectIntl
 @withRouter
 class UI extends React.PureComponent {
-
   static contextTypes = {
     router: PropTypes.object.isRequired,
   };
@@ -226,15 +437,21 @@ class UI extends React.PureComponent {
     dropdownMenuIsOpen: PropTypes.bool,
     layout: PropTypes.string.isRequired,
     firstLaunch: PropTypes.bool,
-    username: PropTypes.string,
+    visibilities: PropTypes.arrayOf(PropTypes.string),
   };
 
   state = {
     draggingOver: false,
   };
 
-  handleBeforeUnload = e => {
-    const { intl, dispatch, isComposing, hasComposingText, hasMediaAttachments } = this.props;
+  handleBeforeUnload = (e) => {
+    const {
+      intl,
+      dispatch,
+      isComposing,
+      hasComposingText,
+      hasMediaAttachments,
+    } = this.props;
 
     dispatch(synchronouslySubmitMarkers());
 
@@ -245,16 +462,16 @@ class UI extends React.PureComponent {
       // but we set user-friendly message for other browsers, e.g. Edge.
       e.returnValue = intl.formatMessage(messages.beforeUnload);
     }
-  }
+  };
 
   handleWindowFocus = () => {
     this.props.dispatch(focusApp());
     this.props.dispatch(submitMarkers({ immediate: true }));
-  }
+  };
 
   handleWindowBlur = () => {
     this.props.dispatch(unfocusApp());
-  }
+  };
 
   handleDragEnter = (e) => {
     e.preventDefault();
@@ -267,10 +484,14 @@ class UI extends React.PureComponent {
       this.dragTargets.push(e.target);
     }
 
-    if (e.dataTransfer && Array.from(e.dataTransfer.types).includes('Files') && this.props.canUploadMore) {
+    if (
+      e.dataTransfer &&
+      Array.from(e.dataTransfer.types).includes("Files") &&
+      this.props.canUploadMore
+    ) {
       this.setState({ draggingOver: true });
     }
-  }
+  };
 
   handleDragOver = (e) => {
     if (this.dataTransferIsText(e.dataTransfer)) return false;
@@ -279,13 +500,11 @@ class UI extends React.PureComponent {
     e.stopPropagation();
 
     try {
-      e.dataTransfer.dropEffect = 'copy';
-    } catch (err) {
-
-    }
+      e.dataTransfer.dropEffect = "copy";
+    } catch (err) {}
 
     return false;
-  }
+  };
 
   handleDrop = (e) => {
     if (this.dataTransferIsText(e.dataTransfer)) return;
@@ -295,45 +514,59 @@ class UI extends React.PureComponent {
     this.setState({ draggingOver: false });
     this.dragTargets = [];
 
-    if (e.dataTransfer && e.dataTransfer.files.length >= 1 && this.props.canUploadMore) {
+    if (
+      e.dataTransfer &&
+      e.dataTransfer.files.length >= 1 &&
+      this.props.canUploadMore
+    ) {
       this.props.dispatch(uploadCompose(e.dataTransfer.files));
     }
-  }
+  };
 
   handleDragLeave = (e) => {
     e.preventDefault();
     e.stopPropagation();
 
-    this.dragTargets = this.dragTargets.filter(el => el !== e.target && this.node.contains(el));
+    this.dragTargets = this.dragTargets.filter(
+      (el) => el !== e.target && this.node.contains(el)
+    );
 
     if (this.dragTargets.length > 0) {
       return;
     }
 
     this.setState({ draggingOver: false });
-  }
+  };
 
   dataTransferIsText = (dataTransfer) => {
-    return (dataTransfer && Array.from(dataTransfer.types).filter((type) => type === 'text/plain').length === 1);
-  }
+    return (
+      dataTransfer &&
+      Array.from(dataTransfer.types).filter((type) => type === "text/plain")
+        .length === 1
+    );
+  };
 
   closeUploadModal = () => {
     this.setState({ draggingOver: false });
-  }
+  };
 
   handleServiceWorkerPostMessage = ({ data }) => {
-    if (data.type === 'navigate') {
+    if (data.type === "navigate") {
       this.context.router.history.push(data.path);
     } else {
-      console.warn('Unknown message type:', data.type);
+      console.warn("Unknown message type:", data.type);
     }
-  }
+  };
 
-  handleLayoutChange = debounce(() => {
-    this.props.dispatch(clearHeight()); // The cached heights are no longer accurate, invalidate
-  }, 500, {
-    trailing: true,
-  });
+  handleLayoutChange = debounce(
+    () => {
+      this.props.dispatch(clearHeight()); // The cached heights are no longer accurate, invalidate
+    },
+    500,
+    {
+      trailing: true,
+    }
+  );
 
   handleResize = () => {
     const layout = layoutFromWindow();
@@ -344,95 +577,102 @@ class UI extends React.PureComponent {
     } else {
       this.handleLayoutChange();
     }
-  }
-
-  componentDidMount () {
-    window.addEventListener('focus', this.handleWindowFocus, false);
-    window.addEventListener('blur', this.handleWindowBlur, false);
-    window.addEventListener('beforeunload', this.handleBeforeUnload, false);
-    window.addEventListener('resize', this.handleResize, { passive: true });
-
-    document.addEventListener('dragenter', this.handleDragEnter, false);
-    document.addEventListener('dragover', this.handleDragOver, false);
-    document.addEventListener('drop', this.handleDrop, false);
-    document.addEventListener('dragleave', this.handleDragLeave, false);
-    document.addEventListener('dragend', this.handleDragEnd, false);
+  };
 
-    if ('serviceWorker' in  navigator) {
-      navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerPostMessage);
+  componentDidMount() {
+    const { dispatch, visibilities } = this.props;
+
+    window.addEventListener("focus", this.handleWindowFocus, false);
+    window.addEventListener("blur", this.handleWindowBlur, false);
+    window.addEventListener("beforeunload", this.handleBeforeUnload, false);
+    window.addEventListener("resize", this.handleResize, { passive: true });
+
+    document.addEventListener("dragenter", this.handleDragEnter, false);
+    document.addEventListener("dragover", this.handleDragOver, false);
+    document.addEventListener("drop", this.handleDrop, false);
+    document.addEventListener("dragleave", this.handleDragLeave, false);
+    document.addEventListener("dragend", this.handleDragEnd, false);
+
+    if ("serviceWorker" in navigator) {
+      navigator.serviceWorker.addEventListener(
+        "message",
+        this.handleServiceWorkerPostMessage
+      );
     }
 
     // On first launch, redirect to the follow recommendations page
     if (this.props.firstLaunch) {
-      this.context.router.history.replace('/start');
-      this.props.dispatch(closeOnboarding());
+      this.context.router.history.replace("/start");
+      dispatch(closeOnboarding());
     }
 
-    this.props.dispatch(fetchMarkers());
-    this.props.dispatch(expandHomeTimeline());
-    this.props.dispatch(expandNotifications());
+    dispatch(fetchMarkers());
+    dispatch(expandHomeTimeline({ visibilities }));
+    dispatch(expandNotifications());
     setTimeout(() => this.props.dispatch(fetchFilters()), 500);
 
     this.hotkeys.__mousetrap__.stopCallback = (e, element) => {
-      return ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName);
+      return ["TEXTAREA", "SELECT", "INPUT"].includes(element.tagName);
     };
   }
 
-  componentWillUnmount () {
-    window.removeEventListener('focus', this.handleWindowFocus);
-    window.removeEventListener('blur', this.handleWindowBlur);
-    window.removeEventListener('beforeunload', this.handleBeforeUnload);
-    window.removeEventListener('resize', this.handleResize);
-
-    document.removeEventListener('dragenter', this.handleDragEnter);
-    document.removeEventListener('dragover', this.handleDragOver);
-    document.removeEventListener('drop', this.handleDrop);
-    document.removeEventListener('dragleave', this.handleDragLeave);
-    document.removeEventListener('dragend', this.handleDragEnd);
+  componentWillUnmount() {
+    window.removeEventListener("focus", this.handleWindowFocus);
+    window.removeEventListener("blur", this.handleWindowBlur);
+    window.removeEventListener("beforeunload", this.handleBeforeUnload);
+    window.removeEventListener("resize", this.handleResize);
+
+    document.removeEventListener("dragenter", this.handleDragEnter);
+    document.removeEventListener("dragover", this.handleDragOver);
+    document.removeEventListener("drop", this.handleDrop);
+    document.removeEventListener("dragleave", this.handleDragLeave);
+    document.removeEventListener("dragend", this.handleDragEnd);
   }
 
-  setRef = c => {
+  setRef = (c) => {
     this.node = c;
-  }
+  };
 
-  handleHotkeyNew = e => {
+  handleHotkeyNew = (e) => {
     e.preventDefault();
 
-    const element = this.node.querySelector('.compose-form__autosuggest-wrapper textarea');
+    const element = this.node.querySelector(
+      ".compose-form__autosuggest-wrapper textarea"
+    );
 
     if (element) {
       element.focus();
     }
-  }
+  };
 
-  handleHotkeySearch = e => {
+  handleHotkeySearch = (e) => {
     e.preventDefault();
 
-    const element = this.node.querySelector('.search__input');
+    const element = this.node.querySelector(".search__input");
 
     if (element) {
       element.focus();
     }
-  }
+  };
 
-  handleHotkeyForceNew = e => {
+  handleHotkeyForceNew = (e) => {
     this.handleHotkeyNew(e);
     this.props.dispatch(resetCompose());
-  }
+  };
 
-  handleHotkeyToggleComposeSpoilers = e => {
+  handleHotkeyToggleComposeSpoilers = (e) => {
     e.preventDefault();
     this.props.dispatch(changeComposeSpoilerness());
-  }
+  };
 
-  handleHotkeyFocusColumn = e => {
-    const index  = (e.key * 1) + 1; // First child is drawer, skip that
+  handleHotkeyFocusColumn = (e) => {
+    const index = e.key * 1 + 1; // First child is drawer, skip that
     const column = this.node.querySelector(`.column:nth-child(${index})`);
     if (!column) return;
-    const container = column.querySelector('.scrollable');
+    const container = column.querySelector(".scrollable");
 
     if (container) {
-      const status = container.querySelector('.focusable');
+      const status = container.querySelector(".focusable");
 
       if (status) {
         if (container.scrollTop > status.offsetTop) {
@@ -441,79 +681,80 @@ class UI extends React.PureComponent {
         status.focus();
       }
     }
-  }
+  };
 
   handleHotkeyBack = () => {
     if (window.history && window.history.length === 1) {
-      this.context.router.history.push('/');
+      this.context.router.history.push("/");
     } else {
       this.context.router.history.goBack();
     }
-  }
+  };
 
-  setHotkeysRef = c => {
+  setHotkeysRef = (c) => {
     this.hotkeys = c;
-  }
+  };
 
   handleHotkeyToggleHelp = () => {
-    if (this.props.location.pathname === '/keyboard-shortcuts') {
+    if (this.props.location.pathname === "/keyboard-shortcuts") {
       this.context.router.history.goBack();
     } else {
-      this.context.router.history.push('/keyboard-shortcuts');
+      this.context.router.history.push("/keyboard-shortcuts");
     }
-  }
+  };
 
   handleHotkeyGoToHome = () => {
-    this.context.router.history.push('/home');
-  }
+    this.context.router.history.push("/home");
+  };
 
   handleHotkeyGoToNotifications = () => {
-    this.context.router.history.push('/notifications');
-  }
+    this.context.router.history.push("/notifications");
+  };
 
   handleHotkeyGoToLocal = () => {
-    this.context.router.history.push('/public/local');
-  }
+    this.context.router.history.push("/public/local");
+  };
 
   handleHotkeyGoToFederated = () => {
-    this.context.router.history.push('/public');
-  }
+    this.context.router.history.push("/public");
+  };
 
   handleHotkeyGoToDirect = () => {
-    this.context.router.history.push('/conversations');
-  }
+    this.context.router.history.push("/conversations");
+  };
 
   handleHotkeyGoToStart = () => {
-    this.context.router.history.push('/getting-started');
-  }
+    this.context.router.history.push("/getting-started");
+  };
 
   handleHotkeyGoToFavourites = () => {
-    this.context.router.history.push('/favourites');
-  }
+    this.context.router.history.push("/favourites");
+  };
 
   handleHotkeyGoToPinned = () => {
-    this.context.router.history.push('/pinned');
-  }
+    this.context.router.history.push("/pinned");
+  };
 
   handleHotkeyGoToProfile = () => {
     this.context.router.history.push(`/@${this.props.username}`);
-  }
+  };
 
   handleHotkeyGoToBlocked = () => {
-    this.context.router.history.push('/blocks');
-  }
+    this.context.router.history.push("/blocks");
+  };
 
   handleHotkeyGoToMuted = () => {
-    this.context.router.history.push('/mutes');
-  }
+    this.context.router.history.push("/mutes");
+  };
 
   handleHotkeyGoToRequests = () => {
-    this.context.router.history.push('/follow_requests');
-  }
+    this.context.router.history.push("/follow_requests");
+  };
 
-  render () {
+  render() {
     const { draggingOver } = this.state;
-    const { children, isComposing, location, dropdownMenuIsOpen, layout } = this.props;
+    const { children, isComposing, location, dropdownMenuIsOpen, layout } =
+      this.props;
 
     const handlers = {
       help: this.handleHotkeyToggleHelp,
@@ -538,15 +779,28 @@ class UI extends React.PureComponent {
     };
 
     return (
-      <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
-        <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
-          <SwitchingColumnsArea location={location} mobile={layout === 'mobile' || layout === 'single-column'}>
+      <HotKeys
+        keyMap={keyMap}
+        handlers={handlers}
+        ref={this.setHotkeysRef}
+        attach={window}
+        focused
+      >
+        <div
+          className={classNames("ui", { "is-composing": isComposing })}
+          ref={this.setRef}
+          style={{ pointerEvents: dropdownMenuIsOpen ? "none" : null }}
+        >
+          <SwitchingColumnsArea
+            location={location}
+            mobile={layout === "mobile" || layout === "single-column"}
+          >
             {children}
           </SwitchingColumnsArea>
 
-          {layout !== 'mobile' && <PictureInPicture />}
+          {layout !== "mobile" && <PictureInPicture />}
           <NotificationsContainer />
-          <LoadingBarContainer className='loading-bar' />
+          <LoadingBarContainer className="loading-bar" />
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
           <DocumentTitle />
@@ -554,5 +808,4 @@ class UI extends React.PureComponent {
       </HotKeys>
     );
   }
-
 }
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 76e48a52d43c50..354e97a228c51e 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -30,6 +30,10 @@ export function DirectTimeline() {
   return import(/* webpackChunkName: "features/direct_timeline" */'../../direct_timeline');
 }
 
+export function LimitedTimeline() {
+  return import(/* webpackChunkName: "features/limited_timeline" */'../../limited_timeline');
+}
+
 export function ListTimeline () {
   return import(/* webpackChunkName: "features/list_timeline" */'../../list_timeline');
 }
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 1389a3c3dff2bb..7629906b909907 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -1,31 +1,49 @@
-const element = document.getElementById('initial-state');
+const element = document.getElementById("initial-state");
 const initialState = element && JSON.parse(element.textContent);
 
-const getMeta = (prop) => initialState && initialState.meta && initialState.meta[prop];
+const getMeta = (prop) =>
+  initialState && initialState.meta && initialState.meta[prop];
 
-export const reduceMotion = getMeta('reduce_motion');
-export const autoPlayGif = getMeta('auto_play_gif');
-export const displayMedia = getMeta('display_media');
-export const expandSpoilers = getMeta('expand_spoilers');
-export const unfollowModal = getMeta('unfollow_modal');
-export const boostModal = getMeta('boost_modal');
-export const deleteModal = getMeta('delete_modal');
-export const me = getMeta('me');
-export const searchEnabled = getMeta('search_enabled');
-export const invitesEnabled = getMeta('invites_enabled');
-export const limitedFederationMode = getMeta('limited_federation_mode');
-export const repository = getMeta('repository');
-export const source_url = getMeta('source_url');
-export const version = getMeta('version');
-export const mascot = getMeta('mascot');
-export const profile_directory = getMeta('profile_directory');
-export const isStaff = getMeta('is_staff');
-export const forceSingleColumn = !getMeta('advanced_layout');
-export const useBlurhash = getMeta('use_blurhash');
-export const usePendingItems = getMeta('use_pending_items');
-export const showTrends = getMeta('trends');
-export const title = getMeta('title');
-export const cropImages = getMeta('crop_images');
-export const disableSwiping = getMeta('disable_swiping');
+export const reduceMotion = getMeta("reduce_motion");
+export const autoPlayGif = getMeta("auto_play_gif");
+export const displayMedia = getMeta("display_media");
+export const expandSpoilers = getMeta("expand_spoilers");
+export const unfollowModal = getMeta("unfollow_modal");
+export const boostModal = getMeta("boost_modal");
+export const deleteModal = getMeta("delete_modal");
+export const me = getMeta("me");
+export const searchEnabled = getMeta("search_enabled");
+export const invitesEnabled = getMeta("invites_enabled");
+export const limitedFederationMode = getMeta("limited_federation_mode");
+export const repository = getMeta("repository");
+export const source_url = getMeta("source_url");
+export const version = getMeta("version");
+export const mascot = getMeta("mascot");
+export const profile_directory = getMeta("profile_directory");
+export const isStaff = getMeta("is_staff");
+export const forceSingleColumn = !getMeta("advanced_layout");
+export const useBlurhash = getMeta("use_blurhash");
+export const usePendingItems = getMeta("use_pending_items");
+export const showTrends = getMeta("trends");
+export const title = getMeta("title");
+export const cropImages = getMeta("crop_images");
+export const disableSwiping = getMeta("disable_swiping");
+export const show_follow_button_on_timeline = getMeta(
+  "show_follow_button_on_timeline"
+);
+export const show_subscribe_button_on_timeline = getMeta(
+  "show_subscribe_button_on_timeline"
+);
+export const show_followed_by = getMeta("show_followed_by");
+export const follow_button_to_list_adder = getMeta(
+  "follow_button_to_list_adder"
+);
+export const show_navigation_panel = getMeta("show_navigation_panel");
+export const show_quote_button = getMeta("show_quote_button");
+export const show_bookmark_button = getMeta("show_bookmark_button");
+export const show_target = getMeta("show_target");
+export const place_tab_bar_at_bottom = getMeta("place_tab_bar_at_bottom");
+export const show_tab_bar_label = getMeta("show_tab_bar_label");
+export const enable_limited_timeline = getMeta("enable_limited_timeline");
 
 export default initialState;
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index d0a6f5af6a0b2b..00be92f7c497d8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -88,6 +88,7 @@
   "column.favourites": "Favourites",
   "column.follow_requests": "Follow requests",
   "column.home": "Home",
+  "column.limited": "Limited home",
   "column.lists": "Lists",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
@@ -188,7 +189,9 @@
   "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home.public_timeline": "the public timeline",
   "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.limited": "Your limited timeline is empty.",
   "empty_column.list": "There is nothing in this list yet. When members of this list publish new posts, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
@@ -225,8 +228,12 @@
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags for this column",
   "home.column_settings.basic": "Basic",
+  "home.column_settings.show_direct": "Show direct",
+  "home.column_settings.show_limited": "Show limited",
+  "home.column_settings.show_private": "Show private",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
+  "home.column_settings.visibility": "Visibility",
   "home.hide_announcements": "Hide announcements",
   "home.show_announcements": "Show announcements",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
@@ -271,6 +278,13 @@
   "lightbox.expand": "Expand image view box",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
+  "limited.column_settings.basic": "Basic",
+  "limited.column_settings.show_direct": "Show direct",
+  "limited.column_settings.show_limited": "Show limited",
+  "limited.column_settings.show_private": "Show private",
+  "limited.column_settings.show_reblogs": "Show boosts",
+  "limited.column_settings.show_replies": "Show replies",
+  "limited.column_settings.visibility": "Visibility",
   "lists.account.add": "Add to list",
   "lists.account.remove": "Remove from list",
   "lists.delete": "Delete list",
@@ -308,6 +322,7 @@
   "navigation_bar.follows_and_followers": "Follows and followers",
   "navigation_bar.info": "About this server",
   "navigation_bar.keyboard_shortcuts": "Hotkeys",
+  "navigation_bar.limited_timeline": "Limited home",
   "navigation_bar.lists": "Lists",
   "navigation_bar.logout": "Logout",
   "navigation_bar.mutes": "Muted users",
@@ -316,6 +331,18 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
+  "navigation_bar.short.community_timeline": "LTL",
+  "navigation_bar.short.getting_started": "Started",
+  "navigation_bar.short.home": "Home",
+  "navigation_bar.short.limited_timeline": "Ltd.",
+  "navigation_bar.short.lists": "Lists",
+  "navigation_bar.short.logout": "Logout",
+  "navigation_bar.short.notifications": "Notif.",
+  "navigation_bar.short.preferences": "Pref.",
+  "navigation_bar.short.public_timeline": "FTL",
+  "navigation_bar.short.search": "Search",
+  "navigation_bar.suggestions": "Suggestions",
+  "navigation_bar.trends": "Trends",
   "notification.favourite": "{name} favourited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -456,6 +483,11 @@
   "suggestions.header": "You might be interested in…",
   "tabs_bar.federated_timeline": "Federated",
   "tabs_bar.home": "Home",
+<<<<<<< HEAD
+=======
+  "tabs_bar.limited_timeline": "Limited",
+  "tabs_bar.lists": "List",
+>>>>>>> 4d681b84c (Add limited timeline)
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notifications",
   "tabs_bar.search": "Search",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index b3305cf5a1fb5d..5b0225e1777bea 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -88,6 +88,7 @@
   "column.favourites": "お気に入り",
   "column.follow_requests": "フォローリクエスト",
   "column.home": "ホーム",
+  "column.limited": "限定ホーム",
   "column.lists": "リスト",
   "column.mutes": "ミュートしたユーザー",
   "column.notifications": "通知",
@@ -189,6 +190,7 @@
   "empty_column.hashtag": "このハッシュタグはまだ使われていません。",
   "empty_column.home": "ホームタイムラインはまだ空っぽです。誰かフォローして埋めてみましょう。 {suggestions}",
   "empty_column.home.suggestions": "おすすめを見る",
+  "empty_column.limited": "まだ誰からも公開範囲が限定された投稿を受け取っていません。",
   "empty_column.list": "このリストにはまだなにもありません。このリストのメンバーが新しい投稿をするとここに表示されます。",
   "empty_column.lists": "まだリストがありません。リストを作るとここに表示されます。",
   "empty_column.mutes": "まだ誰もミュートしていません。",
@@ -225,8 +227,12 @@
   "hashtag.column_settings.tag_mode.none": "これらを除く",
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
   "home.column_settings.basic": "基本設定",
+  "home.column_settings.show_direct": "ダイレクトメッセージを表示",
+  "home.column_settings.show_limited": "サークルを表示",
+  "home.column_settings.show_private": "フォロワー限定を表示",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
+  "home.column_settings.visibility": "公開範囲",
   "home.hide_announcements": "お知らせを隠す",
   "home.show_announcements": "お知らせを表示",
   "intervals.full.days": "{number}日",
@@ -271,6 +277,13 @@
   "lightbox.expand": "画像ビューボックスを開く",
   "lightbox.next": "次",
   "lightbox.previous": "前",
+  "limited.column_settings.basic": "基本設定",
+  "limited.column_settings.show_direct": "ダイレクトメッセージを表示",
+  "limited.column_settings.show_limited": "サークルを表示",
+  "limited.column_settings.show_private": "フォロワー限定を表示",
+  "limited.column_settings.show_reblogs": "ブースト表示",
+  "limited.column_settings.show_replies": "返信表示",
+  "limited.column_settings.visibility": "公開範囲",
   "lists.account.add": "リストに追加",
   "lists.account.remove": "リストから外す",
   "lists.delete": "リストを削除",
@@ -308,6 +321,7 @@
   "navigation_bar.follows_and_followers": "フォロー・フォロワー",
   "navigation_bar.info": "このサーバーについて",
   "navigation_bar.keyboard_shortcuts": "ホットキー",
+  "navigation_bar.limited_timeline": "限定ホーム",
   "navigation_bar.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
   "navigation_bar.mutes": "ミュートしたユーザー",
@@ -316,6 +330,18 @@
   "navigation_bar.preferences": "ユーザー設定",
   "navigation_bar.public_timeline": "連合タイムライン",
   "navigation_bar.security": "セキュリティ",
+  "navigation_bar.short.community_timeline": "ローカル",
+  "navigation_bar.short.getting_started": "スタート",
+  "navigation_bar.short.home": "ホーム",
+  "navigation_bar.short.limited_timeline": "限定",
+  "navigation_bar.short.lists": "リスト",
+  "navigation_bar.short.logout": "ログアウト",
+  "navigation_bar.short.notifications": "通知",
+  "navigation_bar.short.preferences": "設定",
+  "navigation_bar.short.public_timeline": "連合",
+  "navigation_bar.short.search": "検索",
+  "navigation_bar.suggestions": "おすすめユーザー",
+  "navigation_bar.trends": "トレンド",
   "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
   "notification.follow": "{name}さんにフォローされました",
   "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",
@@ -455,6 +481,11 @@
   "suggestions.header": "興味あるかもしれません…",
   "tabs_bar.federated_timeline": "連合",
   "tabs_bar.home": "ホーム",
+<<<<<<< HEAD
+=======
+  "tabs_bar.limited_timeline": "限定ホーム",
+  "tabs_bar.lists": "リスト",
+>>>>>>> 4d681b84c (Add limited timeline)
   "tabs_bar.local_timeline": "ローカル",
   "tabs_bar.notifications": "通知",
   "tabs_bar.search": "検索",
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 2a89919e1f02eb..9d772f60112fe3 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -20,6 +20,23 @@ const initialState = ImmutableMap({
     shows: ImmutableMap({
       reblog: true,
       reply: true,
+      private: false,
+      limited: false,
+      direct: false,
+    }),
+
+    regex: ImmutableMap({
+      body: '',
+    }),
+  }),
+
+  limited: ImmutableMap({
+    shows: ImmutableMap({
+      reblog: true,
+      reply: true,
+      private: true,
+      limited: true,
+      direct: true,
     }),
 
     regex: ImmutableMap({
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index b66c19fd5e8378..284e1a52957bd3 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -10,14 +10,14 @@ import {
   TIMELINE_DISCONNECT,
   TIMELINE_LOAD_PENDING,
   TIMELINE_MARK_AS_PARTIAL,
-} from '../actions/timelines';
+} from "../actions/timelines";
 import {
   ACCOUNT_BLOCK_SUCCESS,
   ACCOUNT_MUTE_SUCCESS,
   ACCOUNT_UNFOLLOW_SUCCESS,
-} from '../actions/accounts';
-import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
-import compareId from '../compare_id';
+} from "../actions/accounts";
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from "immutable";
+import compareId from "../compare_id";
 
 const initialState = ImmutableMap();
 
@@ -31,51 +31,94 @@ const initialTimeline = ImmutableMap({
   items: ImmutableList(),
 });
 
-const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent, usePendingItems) => {
-  return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
-    mMap.set('isLoading', false);
-    mMap.set('isPartial', isPartial);
+const expandNormalizedTimeline = (
+  state,
+  timeline,
+  statuses,
+  next,
+  isPartial,
+  isLoadingRecent,
+  usePendingItems
+) => {
+  return state.update(timeline, initialTimeline, (map) =>
+    map.withMutations((mMap) => {
+      mMap.set("isLoading", false);
+      mMap.set("isPartial", isPartial);
 
-    if (!next && !isLoadingRecent) mMap.set('hasMore', false);
+      if (!next && !isLoadingRecent) mMap.set("hasMore", false);
 
-    if (timeline.endsWith(':pinned')) {
-      mMap.set('items', statuses.map(status => status.get('id')));
-    } else if (!statuses.isEmpty()) {
-      usePendingItems = isLoadingRecent && (usePendingItems || !mMap.get('pendingItems').isEmpty());
+      if (timeline.endsWith(":pinned")) {
+        mMap.set(
+          "items",
+          statuses.map((status) => status.get("id"))
+        );
+      } else if (!statuses.isEmpty()) {
+        usePendingItems =
+          isLoadingRecent &&
+          (usePendingItems || !mMap.get("pendingItems").isEmpty());
 
-      mMap.update(usePendingItems ? 'pendingItems' : 'items', ImmutableList(), oldIds => {
-        const newIds = statuses.map(status => status.get('id'));
+        mMap.update(
+          usePendingItems ? "pendingItems" : "items",
+          ImmutableList(),
+          (oldIds) => {
+            const newIds = statuses.map((status) => status.get("id"));
 
-        const lastIndex = oldIds.findLastIndex(id => id !== null && compareId(id, newIds.last()) >= 0) + 1;
-        const firstIndex = oldIds.take(lastIndex).findLastIndex(id => id !== null && compareId(id, newIds.first()) > 0);
+            const lastIndex =
+              oldIds.findLastIndex(
+                (id) => id !== null && compareId(id, newIds.last()) >= 0
+              ) + 1;
+            const firstIndex = oldIds
+              .take(lastIndex)
+              .findLastIndex(
+                (id) => id !== null && compareId(id, newIds.first()) > 0
+              );
 
-        if (firstIndex < 0) {
-          return (isPartial ? newIds.unshift(null) : newIds).concat(oldIds.skip(lastIndex));
-        }
+            if (firstIndex < 0) {
+              return (isPartial ? newIds.unshift(null) : newIds).concat(
+                oldIds.skip(lastIndex)
+              );
+            }
 
-        return oldIds.take(firstIndex + 1).concat(
-          isPartial && oldIds.get(firstIndex) !== null ? newIds.unshift(null) : newIds,
-          oldIds.skip(lastIndex),
+            return oldIds
+              .take(firstIndex + 1)
+              .concat(
+                isPartial && oldIds.get(firstIndex) !== null
+                  ? newIds.unshift(null)
+                  : newIds,
+                oldIds.skip(lastIndex)
+              );
+          }
         );
-      });
-    }
-  }));
+      }
+    })
+  );
 };
 
 const updateTimeline = (state, timeline, status, usePendingItems) => {
-  const top = state.getIn([timeline, 'top']);
+  const top = state.getIn([timeline, "top"]);
 
-  if (usePendingItems || !state.getIn([timeline, 'pendingItems']).isEmpty()) {
-    if (state.getIn([timeline, 'pendingItems'], ImmutableList()).includes(status.get('id')) || state.getIn([timeline, 'items'], ImmutableList()).includes(status.get('id'))) {
+  if (usePendingItems || !state.getIn([timeline, "pendingItems"]).isEmpty()) {
+    if (
+      state
+        .getIn([timeline, "pendingItems"], ImmutableList())
+        .includes(status.get("id")) ||
+      state
+        .getIn([timeline, "items"], ImmutableList())
+        .includes(status.get("id"))
+    ) {
       return state;
     }
 
-    return state.update(timeline, initialTimeline, map => map.update('pendingItems', list => list.unshift(status.get('id'))).update('unread', unread => unread + 1));
+    return state.update(timeline, initialTimeline, (map) =>
+      map
+        .update("pendingItems", (list) => list.unshift(status.get("id")))
+        .update("unread", (unread) => unread + 1)
+    );
   }
 
-  const ids        = state.getIn([timeline, 'items'], ImmutableList());
-  const includesId = ids.includes(status.get('id'));
-  const unread     = state.getIn([timeline, 'unread'], 0);
+  const ids = state.getIn([timeline, "items"], ImmutableList());
+  const includesId = ids.includes(status.get("id"));
+  const unread = state.getIn([timeline, "unread"], 0);
 
   if (includesId) {
     return state;
@@ -83,23 +126,31 @@ const updateTimeline = (state, timeline, status, usePendingItems) => {
 
   let newIds = ids;
 
-  return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
-    if (!top) mMap.set('unread', unread + 1);
-    if (top && ids.size > 40) newIds = newIds.take(20);
-    mMap.set('items', newIds.unshift(status.get('id')));
-  }));
+  return state.update(timeline, initialTimeline, (map) =>
+    map.withMutations((mMap) => {
+      if (!top) mMap.set("unread", unread + 1);
+      if (top && ids.size > 40) newIds = newIds.take(20);
+      mMap.set("items", newIds.unshift(status.get("id")));
+    })
+  );
 };
 
 const deleteStatus = (state, id, references, exclude_account = null) => {
-  state.keySeq().forEach(timeline => {
-    if (exclude_account === null || (timeline !== `account:${exclude_account}` && !timeline.startsWith(`account:${exclude_account}:`))) {
-      const helper = list => list.filterNot(item => item === id);
-      state = state.updateIn([timeline, 'items'], helper).updateIn([timeline, 'pendingItems'], helper);
+  state.keySeq().forEach((timeline) => {
+    if (
+      exclude_account === null ||
+      (timeline !== `account:${exclude_account}` &&
+        !timeline.startsWith(`account:${exclude_account}:`))
+    ) {
+      const helper = (list) => list.filterNot((item) => item === id);
+      state = state
+        .updateIn([timeline, "items"], helper)
+        .updateIn([timeline, "pendingItems"], helper);
     }
   });
 
   // Remove reblogs of deleted status
-  references.forEach(ref => {
+  references.forEach((ref) => {
     state = deleteStatus(state, ref, [], exclude_account);
   });
 
@@ -113,69 +164,113 @@ const clearTimeline = (state, timeline) => {
 const filterTimelines = (state, relationship, statuses) => {
   let references;
 
-  statuses.forEach(status => {
-    if (status.get('account') !== relationship.id) {
+  statuses.forEach((status) => {
+    if (status.get("account") !== relationship.id) {
       return;
     }
 
-    references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => item.get('id'));
-    state      = deleteStatus(state, status.get('id'), references, relationship.id);
+    references = statuses
+      .filter((item) => item.get("reblog") === status.get("id"))
+      .map((item) => item.get("id"));
+    state = deleteStatus(state, status.get("id"), references, relationship.id);
   });
 
   return state;
 };
 
 const filterTimeline = (timeline, state, relationship, statuses) => {
-  const helper = list => list.filterNot(statusId => statuses.getIn([statusId, 'account']) === relationship.id);
-  return state.updateIn([timeline, 'items'], ImmutableList(), helper).updateIn([timeline, 'pendingItems'], ImmutableList(), helper);
+  const helper = (list) =>
+    list.filterNot(
+      (statusId) => statuses.getIn([statusId, "account"]) === relationship.id
+    );
+  return state
+    .updateIn([timeline, "items"], ImmutableList(), helper)
+    .updateIn([timeline, "pendingItems"], ImmutableList(), helper);
 };
 
 const updateTop = (state, timeline, top) => {
-  return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
-    if (top) mMap.set('unread', mMap.get('pendingItems').size);
-    mMap.set('top', top);
-  }));
+  return state.update(timeline, initialTimeline, (map) =>
+    map.withMutations((mMap) => {
+      if (top) mMap.set("unread", mMap.get("pendingItems").size);
+      mMap.set("top", top);
+    })
+  );
 };
 
 export default function timelines(state = initialState, action) {
-  switch(action.type) {
-  case TIMELINE_LOAD_PENDING:
-    return state.update(action.timeline, initialTimeline, map =>
-      map.update('items', list => map.get('pendingItems').concat(list.take(40))).set('pendingItems', ImmutableList()).set('unread', 0));
-  case TIMELINE_EXPAND_REQUEST:
-    return state.update(action.timeline, initialTimeline, map => map.set('isLoading', true));
-  case TIMELINE_EXPAND_FAIL:
-    return state.update(action.timeline, initialTimeline, map => map.set('isLoading', false));
-  case TIMELINE_EXPAND_SUCCESS:
-    return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent, action.usePendingItems);
-  case TIMELINE_UPDATE:
-    return updateTimeline(state, action.timeline, fromJS(action.status), action.usePendingItems);
-  case TIMELINE_DELETE:
-    return deleteStatus(state, action.id, action.references, action.reblogOf);
-  case TIMELINE_CLEAR:
-    return clearTimeline(state, action.timeline);
-  case ACCOUNT_BLOCK_SUCCESS:
-  case ACCOUNT_MUTE_SUCCESS:
-    return filterTimelines(state, action.relationship, action.statuses);
-  case ACCOUNT_UNFOLLOW_SUCCESS:
-    return filterTimeline('home', state, action.relationship, action.statuses);
-  case TIMELINE_SCROLL_TOP:
-    return updateTop(state, action.timeline, action.top);
-  case TIMELINE_CONNECT:
-    return state.update(action.timeline, initialTimeline, map => map.set('online', true));
-  case TIMELINE_DISCONNECT:
-    return state.update(
-      action.timeline,
-      initialTimeline,
-      map => map.set('online', false).update(action.usePendingItems ? 'pendingItems' : 'items', items => items.first() ? items.unshift(null) : items),
-    );
-  case TIMELINE_MARK_AS_PARTIAL:
-    return state.update(
-      action.timeline,
-      initialTimeline,
-      map => map.set('isPartial', true).set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('unread', 0),
-    );
-  default:
-    return state;
+  switch (action.type) {
+    case TIMELINE_LOAD_PENDING:
+      return state.update(action.timeline, initialTimeline, (map) =>
+        map
+          .update("items", (list) =>
+            map.get("pendingItems").concat(list.take(40))
+          )
+          .set("pendingItems", ImmutableList())
+          .set("unread", 0)
+      );
+    case TIMELINE_EXPAND_REQUEST:
+      return state.update(action.timeline, initialTimeline, (map) =>
+        map.set("isLoading", true)
+      );
+    case TIMELINE_EXPAND_FAIL:
+      return state.update(action.timeline, initialTimeline, (map) =>
+        map.set("isLoading", false)
+      );
+    case TIMELINE_EXPAND_SUCCESS:
+      return expandNormalizedTimeline(
+        state,
+        action.timeline,
+        fromJS(action.statuses),
+        action.next,
+        action.partial,
+        action.isLoadingRecent,
+        action.usePendingItems
+      );
+    case TIMELINE_UPDATE:
+      return updateTimeline(
+        state,
+        action.timeline,
+        fromJS(action.status),
+        action.usePendingItems
+      );
+    case TIMELINE_DELETE:
+      return deleteStatus(state, action.id, action.references, action.reblogOf);
+    case TIMELINE_CLEAR:
+      return clearTimeline(state, action.timeline);
+    case ACCOUNT_BLOCK_SUCCESS:
+    case ACCOUNT_MUTE_SUCCESS:
+      return filterTimelines(state, action.relationship, action.statuses);
+    case ACCOUNT_UNFOLLOW_SUCCESS:
+    case ACCOUNT_UNSUBSCRIBE_SUCCESS:
+      return filterTimeline(
+        "home",
+        state,
+        action.relationship,
+        action.statuses
+      ).filterTimeline("limited", state, action.relationship, action.statuses);
+    case TIMELINE_SCROLL_TOP:
+      return updateTop(state, action.timeline, action.top);
+    case TIMELINE_CONNECT:
+      return state.update(action.timeline, initialTimeline, (map) =>
+        map.set("online", true)
+      );
+    case TIMELINE_DISCONNECT:
+      return state.update(action.timeline, initialTimeline, (map) =>
+        map
+          .set("online", false)
+          .update(action.usePendingItems ? "pendingItems" : "items", (items) =>
+            items.first() ? items.unshift(null) : items
+          )
+      );
+    case TIMELINE_MARK_AS_PARTIAL:
+      return state.update(action.timeline, initialTimeline, (map) =>
+        map
+          .set("isPartial", true)
+          .set("items", ImmutableList())
+          .set("pendingItems", ImmutableList())
+          .set("unread", 0)
+      );
+    default:
+      return state;
   }
-};
+}
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 1e19db65d027f0..7970ee522dddc0 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,6 +1,6 @@
 import { createSelector } from 'reselect';
 import { List as ImmutableList, Map as ImmutableMap, is } from 'immutable';
-import { me } from '../initial_state';
+import { me, enable_limited_timeline } from '../initial_state';
 
 const getAccountBase         = (state, id) => state.getIn(['accounts', id], null);
 const getAccountCounters     = (state, id) => state.getIn(['accounts_counters', id], null);
@@ -175,3 +175,25 @@ export const getAccountGallery = createSelector([
 
   return medias;
 });
+
+export const getHomeVisibilities = createSelector(
+  state => state.getIn(['settings', 'home', 'shows']),
+  shows => {
+    return enable_limited_timeline ? (
+      ['public', 'unlisted']
+      .concat(shows.get('private') ? ['private'] : [])
+      .concat(shows.get('limited') ? ['limited'] : [])
+      .concat(shows.get('direct')  ? ['direct']  : [])
+    ) : [];
+});
+
+export const getLimitedVisibilities = createSelector(
+  state => state.getIn(['settings', 'limited', 'shows']),
+  shows => {
+    return enable_limited_timeline ? (
+      []
+      .concat(shows.get('private') ? ['private'] : [])
+      .concat(shows.get('limited') ? ['limited'] : [])
+      .concat(shows.get('direct')  ? ['direct']  : [])
+    ) : [];
+});
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index e37bc6d9f11437..3874ba44c33ec8 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -15,30 +15,42 @@ def update(settings)
   private
 
   def process_update
-    user.settings['notification_emails'] = merged_notification_emails if change?('notification_emails')
-    user.settings['interactions']        = merged_interactions if change?('interactions')
-    user.settings['default_privacy']     = default_privacy_preference if change?('setting_default_privacy')
-    user.settings['default_sensitive']   = default_sensitive_preference if change?('setting_default_sensitive')
-    user.settings['default_language']    = default_language_preference if change?('setting_default_language')
-    user.settings['unfollow_modal']      = unfollow_modal_preference if change?('setting_unfollow_modal')
-    user.settings['boost_modal']         = boost_modal_preference if change?('setting_boost_modal')
-    user.settings['delete_modal']        = delete_modal_preference if change?('setting_delete_modal')
-    user.settings['auto_play_gif']       = auto_play_gif_preference if change?('setting_auto_play_gif')
-    user.settings['display_media']       = display_media_preference if change?('setting_display_media')
-    user.settings['expand_spoilers']     = expand_spoilers_preference if change?('setting_expand_spoilers')
-    user.settings['reduce_motion']       = reduce_motion_preference if change?('setting_reduce_motion')
-    user.settings['disable_swiping']     = disable_swiping_preference if change?('setting_disable_swiping')
-    user.settings['system_font_ui']      = system_font_ui_preference if change?('setting_system_font_ui')
-    user.settings['noindex']             = noindex_preference if change?('setting_noindex')
-    user.settings['theme']               = theme_preference if change?('setting_theme')
-    user.settings['hide_network']        = hide_network_preference if change?('setting_hide_network')
-    user.settings['aggregate_reblogs']   = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
-    user.settings['show_application']    = show_application_preference if change?('setting_show_application')
-    user.settings['advanced_layout']     = advanced_layout_preference if change?('setting_advanced_layout')
-    user.settings['use_blurhash']        = use_blurhash_preference if change?('setting_use_blurhash')
-    user.settings['use_pending_items']   = use_pending_items_preference if change?('setting_use_pending_items')
-    user.settings['trends']              = trends_preference if change?('setting_trends')
-    user.settings['crop_images']         = crop_images_preference if change?('setting_crop_images')
+    user.settings['notification_emails']               = merged_notification_emails if change?('notification_emails')
+    user.settings['interactions']                      = merged_interactions if change?('interactions')
+    user.settings['default_privacy']                   = default_privacy_preference if change?('setting_default_privacy')
+    user.settings['default_sensitive']                 = default_sensitive_preference if change?('setting_default_sensitive')
+    user.settings['default_language']                  = default_language_preference if change?('setting_default_language')
+    user.settings['unfollow_modal']                    = unfollow_modal_preference if change?('setting_unfollow_modal')
+    user.settings['unsubscribe_modal']                 = unsubscribe_modal_preference if change?('setting_unsubscribe_modal')
+    user.settings['boost_modal']                       = boost_modal_preference if change?('setting_boost_modal')
+    user.settings['delete_modal']                      = delete_modal_preference if change?('setting_delete_modal')
+    user.settings['auto_play_gif']                     = auto_play_gif_preference if change?('setting_auto_play_gif')
+    user.settings['display_media']                     = display_media_preference if change?('setting_display_media')
+    user.settings['expand_spoilers']                   = expand_spoilers_preference if change?('setting_expand_spoilers')
+    user.settings['reduce_motion']                     = reduce_motion_preference if change?('setting_reduce_motion')
+    user.settings['disable_swiping']                   = disable_swiping_preference if change?('setting_disable_swiping')
+    user.settings['system_font_ui']                    = system_font_ui_preference if change?('setting_system_font_ui')
+    user.settings['noindex']                           = noindex_preference if change?('setting_noindex')
+    user.settings['theme']                             = theme_preference if change?('setting_theme')
+    user.settings['hide_network']                      = hide_network_preference if change?('setting_hide_network')
+    user.settings['aggregate_reblogs']                 = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
+    user.settings['show_application']                  = show_application_preference if change?('setting_show_application')
+    user.settings['advanced_layout']                   = advanced_layout_preference if change?('setting_advanced_layout')
+    user.settings['use_blurhash']                      = use_blurhash_preference if change?('setting_use_blurhash')
+    user.settings['use_pending_items']                 = use_pending_items_preference if change?('setting_use_pending_items')
+    user.settings['trends']                            = trends_preference if change?('setting_trends')
+    user.settings['crop_images']                       = crop_images_preference if change?('setting_crop_images')
+    user.settings['show_follow_button_on_timeline']    = show_follow_button_on_timeline_preference if change?('setting_show_follow_button_on_timeline')
+    user.settings['show_subscribe_button_on_timeline'] = show_subscribe_button_on_timeline_preference if change?('setting_show_subscribe_button_on_timeline')
+    user.settings['show_followed_by']                  = show_followed_by_preference if change?('setting_show_followed_by')
+    user.settings['follow_button_to_list_adder']       = follow_button_to_list_adder_preference if change?('setting_follow_button_to_list_adder')
+    user.settings['show_navigation_panel']             = show_navigation_panel_preference if change?('setting_show_navigation_panel')
+    user.settings['show_quote_button']                 = show_quote_button_preference if change?('setting_show_quote_button')
+    user.settings['show_bookmark_button']              = show_bookmark_button_preference if change?('setting_show_bookmark_button')
+    user.settings['show_target']                       = show_target_preference if change?('setting_show_target')
+    user.settings['place_tab_bar_at_bottom']           = place_tab_bar_at_bottom_preference if change?('setting_place_tab_bar_at_bottom')
+    user.settings['show_tab_bar_label']                = show_tab_bar_label_preference if change?('setting_show_tab_bar_label')
+    user.settings['enable_limited_timeline']           = enable_limited_timeline_preference if change?('setting_enable_limited_timeline')
   end
 
   def merged_notification_emails
@@ -137,6 +149,50 @@ def crop_images_preference
     boolean_cast_setting 'setting_crop_images'
   end
 
+  def show_follow_button_on_timeline_preference
+    boolean_cast_setting 'setting_show_follow_button_on_timeline'
+  end
+
+  def show_subscribe_button_on_timeline_preference
+    boolean_cast_setting 'setting_show_subscribe_button_on_timeline'
+  end
+
+  def show_followed_by_preference
+    boolean_cast_setting 'setting_show_followed_by'
+  end
+
+  def follow_button_to_list_adder_preference
+    boolean_cast_setting 'setting_follow_button_to_list_adder'
+  end
+
+  def show_navigation_panel_preference
+    boolean_cast_setting 'setting_show_navigation_panel'
+  end
+
+  def show_quote_button_preference
+    boolean_cast_setting 'setting_show_quote_button'
+  end
+
+  def show_bookmark_button_preference
+    boolean_cast_setting 'setting_show_bookmark_button'
+  end
+
+  def show_target_preference
+    boolean_cast_setting 'setting_show_target'
+  end
+
+  def place_tab_bar_at_bottom_preference
+    boolean_cast_setting 'setting_place_tab_bar_at_bottom'
+  end
+
+  def show_tab_bar_label_preference
+    boolean_cast_setting 'setting_show_tab_bar_label'
+  end
+
+  def enable_limited_timeline_preference
+    boolean_cast_setting 'setting_enable_limited_timeline'
+  end
+
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index f51dcfab1dad66..28947cae53f2f6 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -8,27 +8,29 @@ def initialize(type, id)
     @id   = id
   end
 
-  def get(limit, max_id = nil, since_id = nil, min_id = nil)
+  def get(limit, max_id = nil, since_id = nil, min_id = nil, visibilities = [])
     limit    = limit.to_i
     max_id   = max_id.to_i if max_id.present?
     since_id = since_id.to_i if since_id.present?
     min_id   = min_id.to_i if min_id.present?
 
-    from_redis(limit, max_id, since_id, min_id)
+    from_redis(limit, max_id, since_id, min_id, visibilities)
   end
 
   protected
 
-  def from_redis(limit, max_id, since_id, min_id)
+  def from_redis(limit, max_id, since_id, min_id, visibilities)
     max_id = '+inf' if max_id.blank?
     if min_id.blank?
       since_id   = '-inf' if since_id.blank?
-      unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+      unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, visibilities.empty? ? limit : FeedManager::MAX_ITEMS], with_scores: true).map(&:first).map(&:to_i)
     else
-      unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+      unhydrated = redis.zrangebyscore(key, "(#{min_id}", "(#{max_id}", limit: [0, visibilities.empty? ? limit : FeedManager::MAX_ITEMS], with_scores: true).map(&:first).map(&:to_i)
     end
 
-    Status.where(id: unhydrated).cache_ids
+    statuses = Status.where(id: unhydrated)
+    statuses = statuses.where(visibility: visibilities).limit(limit) unless visibilities.empty?
+    statuses.cache_ids
   end
 
   def key
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index b3b913946a706c..638a27aaeecefe 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -26,21 +26,33 @@ def meta
     }
 
     if object.current_account
-      store[:me]                = object.current_account.id.to_s
-      store[:unfollow_modal]    = object.current_account.user.setting_unfollow_modal
-      store[:boost_modal]       = object.current_account.user.setting_boost_modal
-      store[:delete_modal]      = object.current_account.user.setting_delete_modal
-      store[:auto_play_gif]     = object.current_account.user.setting_auto_play_gif
-      store[:display_media]     = object.current_account.user.setting_display_media
-      store[:expand_spoilers]   = object.current_account.user.setting_expand_spoilers
-      store[:reduce_motion]     = object.current_account.user.setting_reduce_motion
-      store[:disable_swiping]   = object.current_account.user.setting_disable_swiping
-      store[:advanced_layout]   = object.current_account.user.setting_advanced_layout
-      store[:use_blurhash]      = object.current_account.user.setting_use_blurhash
-      store[:use_pending_items] = object.current_account.user.setting_use_pending_items
-      store[:is_staff]          = object.current_account.user.staff?
-      store[:trends]            = Setting.trends && object.current_account.user.setting_trends
-      store[:crop_images]       = object.current_account.user.setting_crop_images
+      store[:me]                                = object.current_account.id.to_s
+      store[:unfollow_modal]                    = object.current_account.user.setting_unfollow_modal
+      store[:unsubscribe_modal]                 = object.current_account.user.setting_unsubscribe_modal
+      store[:boost_modal]                       = object.current_account.user.setting_boost_modal
+      store[:delete_modal]                      = object.current_account.user.setting_delete_modal
+      store[:auto_play_gif]                     = object.current_account.user.setting_auto_play_gif
+      store[:display_media]                     = object.current_account.user.setting_display_media
+      store[:expand_spoilers]                   = object.current_account.user.setting_expand_spoilers
+      store[:reduce_motion]                     = object.current_account.user.setting_reduce_motion
+      store[:disable_swiping]                   = object.current_account.user.setting_disable_swiping
+      store[:advanced_layout]                   = object.current_account.user.setting_advanced_layout
+      store[:use_blurhash]                      = object.current_account.user.setting_use_blurhash
+      store[:use_pending_items]                 = object.current_account.user.setting_use_pending_items
+      store[:is_staff]                          = object.current_account.user.staff?
+      store[:trends]                            = Setting.trends && object.current_account.user.setting_trends
+      store[:crop_images]                       = object.current_account.user.setting_crop_images
+      store[:show_follow_button_on_timeline]    = object.current_account.user.setting_show_follow_button_on_timeline
+      store[:show_subscribe_button_on_timeline] = object.current_account.user.setting_show_subscribe_button_on_timeline
+      store[:show_followed_by]                  = object.current_account.user.setting_show_followed_by
+      store[:follow_button_to_list_adder]       = object.current_account.user.setting_follow_button_to_list_adder
+      store[:show_navigation_panel]             = object.current_account.user.setting_show_navigation_panel
+      store[:show_quote_button]                 = object.current_account.user.setting_show_quote_button
+      store[:show_bookmark_button]              = object.current_account.user.setting_show_bookmark_button
+      store[:show_target]                       = object.current_account.user.setting_show_target
+      store[:place_tab_bar_at_bottom]           = object.current_account.user.setting_place_tab_bar_at_bottom
+      store[:show_tab_bar_label]                = object.current_account.user.setting_show_tab_bar_label
+      store[:enable_limited_timeline]           = object.current_account.user.setting_enable_limited_timeline
     else
       store[:auto_play_gif] = Setting.auto_play_gif
       store[:display_media] = Setting.display_media
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 0157939897b995..bd1dbc4daa120b 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -52,6 +52,8 @@ en:
         setting_display_media_default: Hide media marked as sensitive
         setting_display_media_hide_all: Always hide media
         setting_display_media_show_all: Always show media
+        setting_enable_limited_timeline: Enable a limited home to display private and circle and direct message
+        setting_follow_button_to_list_adder: Change the behavior of the Follow / Subscribe button, open a dialog where you can select a list to follow / subscribe, or opt out of receiving at home
         setting_hide_network: Who you follow and who follows you will be hidden on your profile
         setting_noindex: Affects your public profile and post pages
         setting_show_application: The application you use to post will be displayed in the detailed view of your posts
@@ -65,7 +67,7 @@ en:
         domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected.
         with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blocked
       featured_tag:
-        name: 'You might want to use one of these:'
+        name: "You might want to use one of these:"
       form_challenge:
         current_password: You are entering a secure area
       imports:
@@ -83,7 +85,7 @@ en:
       rule:
         text: Describe a rule or requirement for users on this server. Try to keep it short and simple
       sessions:
-        otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
+        otp: "Enter the two-factor code generated by your phone app or use one of your recovery codes:"
         webauthn: If it's an USB key be sure to insert it and, if necessary, tap it.
       tag:
         name: You can only change the casing of the letters, for example, to make it more readable
@@ -160,6 +162,7 @@ en:
         setting_display_media_default: Default
         setting_display_media_hide_all: Hide all
         setting_display_media_show_all: Show all
+        setting_enable_limited_timeline: Enable limited timeline
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
         setting_noindex: Opt-out of search engine indexing
@@ -213,7 +216,7 @@ en:
         name: Hashtag
         trendable: Allow this hashtag to appear under trends
         usable: Allow posts to use this hashtag
-    'no': 'No'
+    "no": "No"
     recommended: Recommended
     required:
       mark: "*"
@@ -221,4 +224,4 @@ en:
     title:
       sessions:
         webauthn: Use one of your security keys to sign in
-    'yes': 'Yes'
+    "yes": "Yes"
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 4c4133bafee398..3fd4fb75fe8f9b 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -51,6 +51,8 @@ ja:
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
         setting_display_media_hide_all: メディアを常に隠す
         setting_display_media_show_all: メディアを常に表示する
+        setting_enable_limited_timeline: フォロワー限定・サークル・ダイレクトメッセージを表示する限定ホームを有効にします
+        setting_follow_button_to_list_adder: フォロー・購読ボタンの動作を変更し、フォロー・購読するリストを選択したり、ホームで受け取らないよう設定するダイアログを開きます
         setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
         setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
@@ -64,7 +66,7 @@ ja:
         domain: メールアドレスのドメイン名および、名前解決したMXレコード、IPアドレスを指定できます。ユーザー登録時にこれらをチェックし、該当する場合はユーザー登録を拒否します。
         with_dns_records: 指定したドメインのDNSレコードを取得し、その結果もメールドメインブロックに登録されます
       featured_tag:
-        name: 'これらを使うといいかもしれません:'
+        name: "これらを使うといいかもしれません:"
       form_challenge:
         current_password: セキュリティ上重要なエリアにアクセスしています
       imports:
@@ -82,7 +84,7 @@ ja:
       rule:
         text: ユーザーのためのルールや要件を記述してください。短くシンプルにしてください。
       sessions:
-        otp: '携帯電話のアプリで生成された二段階認証コードを入力するか、リカバリーコードを使用してください:'
+        otp: "携帯電話のアプリで生成された二段階認証コードを入力するか、リカバリーコードを使用してください:"
         webauthn: USBキーの場合は、必ず挿入し、必要に応じてタップしてください。
       tag:
         name: 視認性向上などのためにアルファベット大文字小文字の変更のみ行うことができます
@@ -159,6 +161,7 @@ ja:
         setting_display_media_default: 標準
         setting_display_media_hide_all: 非表示
         setting_display_media_show_all: 表示
+        setting_enable_limited_timeline: 限定ホームを有効にする
         setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する
         setting_hide_network: 繋がりを隠す
         setting_noindex: 検索エンジンによるインデックスを拒否する
@@ -212,7 +215,7 @@ ja:
         name: ハッシュタグ
         trendable: トレンドへの表示を許可する
         usable: 投稿への使用を許可する
-    'no': いいえ
+    "no": いいえ
     recommended: おすすめ
     required:
       mark: "*"
@@ -220,4 +223,4 @@ ja:
     title:
       sessions:
         webauthn: セキュリティキーを使用してサインインする
-    'yes': はい
+    "yes": はい
diff --git a/config/settings.yml b/config/settings.yml
index 06cee253240fac..4d2c34367d716b 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -3,17 +3,17 @@
 
 defaults: &defaults
   site_title: Mastodon
-  site_short_description: ''
-  site_description: ''
-  site_extended_description: ''
-  site_terms: ''
-  site_contact_username: ''
-  site_contact_email: ''
-  registrations_mode: 'open'
+  site_short_description: ""
+  site_description: ""
+  site_extended_description: ""
+  site_terms: ""
+  site_contact_username: ""
+  site_contact_email: ""
+  registrations_mode: "open"
   profile_directory: true
-  closed_registrations_message: ''
+  closed_registrations_message: ""
   open_deletion: true
-  min_invite_role: 'admin'
+  min_invite_role: "admin"
   timeline_preview: true
   show_staff_badge: true
   default_sensitive: false
@@ -22,7 +22,7 @@ defaults: &defaults
   boost_modal: false
   delete_modal: true
   auto_play_gif: false
-  display_media: 'default'
+  display_media: "default"
   expand_spoilers: false
   preview_sensitive_media: false
   reduce_motion: false
@@ -30,7 +30,7 @@ defaults: &defaults
   show_application: true
   system_font_ui: false
   noindex: false
-  theme: 'default'
+  theme: "default"
   aggregate_reblogs: true
   advanced_layout: false
   use_blurhash: true
@@ -38,6 +38,17 @@ defaults: &defaults
   trends: true
   trendable_by_default: false
   crop_images: true
+  show_follow_button_on_timeline: false
+  show_subscribe_button_on_timeline: false
+  show_followed_by: false
+  follow_button_to_list_adder: false
+  show_navigation_panel: true
+  show_bookmark_button: true
+  show_quote_button: true
+  show_target: false
+  place_tab_bar_at_bottom: false
+  show_tab_bar_label: false
+  enable_limited_timeline: false
   notification_emails:
     follow: false
     reblog: false
@@ -62,12 +73,12 @@ defaults: &defaults
     - mod
     - moderator
   disallowed_hashtags: # space separated string or list of hashtags without the hash
-  bootstrap_timeline_accounts: ''
+  bootstrap_timeline_accounts: ""
   activity_api_enabled: true
   peers_api_enabled: true
   show_known_fediverse_at_about_page: true
-  show_domain_blocks: 'disabled'
-  show_domain_blocks_rationale: 'disabled'
+  show_domain_blocks: "disabled"
+  show_domain_blocks_rationale: "disabled"
   require_invite_text: false
 
 development: