diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx
index 0898279f9..b15b2d72a 100644
--- a/app/soapbox/components/sidebar-navigation.tsx
+++ b/app/soapbox/components/sidebar-navigation.tsx
@@ -27,7 +27,7 @@ const SidebarNavigation = () => {
         <SidebarNavigationLink
           to='/'
           icon={require('icons/feed.svg')}
-          text={<FormattedMessage id='tabs_bar.home' defaultMessage='Feed' />}
+          text={<FormattedMessage id='tabs_bar.home' defaultMessage='Home' />}
         />
 
         {account && (
@@ -42,7 +42,7 @@ const SidebarNavigation = () => {
               to='/notifications'
               icon={require('icons/alert.svg')}
               count={notificationCount}
-              text={<FormattedMessage id='tabs_bar.notifications' defaultMessage='Alerts' />}
+              text={<FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' />}
             />
 
             <SidebarNavigationLink
@@ -95,27 +95,25 @@ const SidebarNavigation = () => {
           />
         )}
 
-        {/* {features.federating ? (
-          <NavLink to='/timeline/local' className='btn grouped'>
-            <Icon
-              src={require('@tabler/icons/icons/users.svg')}
-              className={classNames('primary-navigation__icon', { 'svg-icon--active': location.pathname === '/timeline/local' })}
-            />
-            {instance.title}
-          </NavLink>
-        ) : (
-          <NavLink to='/timeline/local' className='btn grouped'>
-            <Icon src={require('@tabler/icons/icons/world.svg')} className='primary-navigation__icon' />
-            <FormattedMessage id='tabs_bar.all' defaultMessage='All' />
-          </NavLink>
+        {(features.localTimeline || features.publicTimeline) && (
+          <hr className='dark:border-slate-700' />
         )}
 
-        {features.federating && (
-          <NavLink to='/timeline/fediverse' className='btn grouped'>
-            <Icon src={require('icons/fediverse.svg')} className='column-header__icon' />
-            <FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />
-          </NavLink>
-        )} */}
+        {features.localTimeline && (
+          <SidebarNavigationLink
+            to='/timeline/local'
+            icon={features.federating ? require('@tabler/icons/icons/users.svg') : require('@tabler/icons/icons/world.svg')}
+            text={features.federating ? instance.title : <FormattedMessage id='tabs_bar.all' defaultMessage='All' />}
+          />
+        )}
+
+        {(features.publicTimeline && features.federating) && (
+          <SidebarNavigationLink
+            to='/timeline/fediverse'
+            icon={require('icons/fediverse.svg')}
+            text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+          />
+        )}
       </div>
 
       {account && (
diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.tsx
similarity index 73%
rename from app/soapbox/components/sidebar_menu.js
rename to app/soapbox/components/sidebar_menu.tsx
index bba7d06ce..c31ec29db 100644
--- a/app/soapbox/components/sidebar_menu.js
+++ b/app/soapbox/components/sidebar_menu.tsx
@@ -1,23 +1,24 @@
 import classNames from 'classnames';
-import PropTypes from 'prop-types';
 import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
-import { useDispatch, useSelector } from 'react-redux';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+import { useDispatch } from 'react-redux';
 import { Link, NavLink } from 'react-router-dom';
 
 import { logOut, switchAccount } from 'soapbox/actions/auth';
 import { fetchOwnAccounts } from 'soapbox/actions/auth';
-import { getSoapboxConfig } from 'soapbox/actions/soapbox';
 import Account from 'soapbox/components/account';
 import { Stack } from 'soapbox/components/ui';
 import ProfileStats from 'soapbox/features/ui/components/profile_stats';
-import { getFeatures } from 'soapbox/utils/features';
+import { useAppSelector, useSoapboxConfig, useFeatures } from 'soapbox/hooks';
 
 import { closeSidebar } from '../actions/sidebar';
 import { makeGetAccount, makeGetOtherAccounts } from '../selectors';
 
 import { HStack, Icon, IconButton, Text } from './ui';
 
+import type { List as ImmutableList } from 'immutable';
+import type { Account as AccountEntity } from 'soapbox/types/entities';
+
 const messages = defineMessages({
   followers: { id: 'account.followers', defaultMessage: 'Followers' },
   follows: { id: 'account.follows', defaultMessage: 'Follows' },
@@ -33,7 +34,14 @@ const messages = defineMessages({
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
 });
 
-const SidebarLink = ({ to, icon, text, onClick }) => (
+interface ISidebarLink {
+  to: string,
+  icon: string,
+  text: string | JSX.Element,
+  onClick: React.EventHandler<React.MouseEvent>,
+}
+
+const SidebarLink: React.FC<ISidebarLink> = ({ to, icon, text, onClick }) => (
   <NavLink className='group py-1 rounded-md' to={to} onClick={onClick}>
     <HStack space={2} alignItems='center'>
       <div className='bg-primary-50 dark:bg-slate-700 relative rounded inline-flex p-2'>
@@ -45,25 +53,20 @@ const SidebarLink = ({ to, icon, text, onClick }) => (
   </NavLink>
 );
 
-SidebarLink.propTypes = {
-  to: PropTypes.string.isRequired,
-  icon: PropTypes.string.isRequired,
-  text: PropTypes.string.isRequired,
-  onClick: PropTypes.func.isRequired,
-};
+const getOtherAccounts = makeGetOtherAccounts();
 
-const SidebarMenu = () => {
+const SidebarMenu: React.FC = (): JSX.Element | null => {
   const intl = useIntl();
   const dispatch = useDispatch();
 
-  const logo = useSelector((state) => getSoapboxConfig(state).get('logo'));
-  const features = useSelector((state) => getFeatures(state.get('instance')));
+  const { logo } = useSoapboxConfig();
+  const features = useFeatures();
   const getAccount = makeGetAccount();
-  const getOtherAccounts = makeGetOtherAccounts();
-  const me = useSelector((state) => state.get('me'));
-  const account = useSelector((state) => getAccount(state, me));
-  const otherAccounts = useSelector((state) => getOtherAccounts(state));
-  const sidebarOpen = useSelector((state) => state.get('sidebar').sidebarOpen);
+  const instance = useAppSelector((state) => state.instance);
+  const me = useAppSelector((state) => state.me);
+  const account = useAppSelector((state) =>  me ? getAccount(state, me) : null);
+  const otherAccounts: ImmutableList<AccountEntity> = useAppSelector((state) => getOtherAccounts(state));
+  const sidebarOpen = useAppSelector((state) => state.sidebar.sidebarOpen);
 
   const closeButtonRef = React.useRef(null);
 
@@ -76,25 +79,27 @@ const SidebarMenu = () => {
     onClose();
   };
 
-  const handleSwitchAccount = (event, account) => {
-    event.preventDefault();
-    switchAccount(account);
-    dispatch(switchAccount(account.get('id')));
+  const handleSwitchAccount = (account: AccountEntity): React.EventHandler<React.MouseEvent> => {
+    return (e) => {
+      e.preventDefault();
+      switchAccount(account);
+      dispatch(switchAccount(account.id));
+    };
   };
 
-  const onClickLogOut = (event) => {
-    event.preventDefault();
+  const onClickLogOut: React.EventHandler<React.MouseEvent> = (e) => {
+    e.preventDefault();
     dispatch(logOut(intl));
   };
 
-  const handleSwitcherClick = (e) => {
+  const handleSwitcherClick: React.EventHandler<React.MouseEvent> = (e) => {
     e.preventDefault();
 
     setSwitcher((prevState) => (!prevState));
   };
 
-  const renderAccount = (account) => (
-    <a href='/' className='block py-2' onClick={(event) => handleSwitchAccount(event, account)} key={account.get('id')}>
+  const renderAccount = (account: AccountEntity) => (
+    <a href='/' className='block py-2' onClick={handleSwitchAccount(account)} key={account.id}>
       <Account account={account} showProfileHoverCard={false} />
     </a>
   );
@@ -103,17 +108,13 @@ const SidebarMenu = () => {
     dispatch(fetchOwnAccounts());
   }, []);
 
-  if (!account) {
-    return null;
-  }
-
-  const acct = account.get('acct');
-  const classes = classNames('sidebar-menu__root', {
-    'sidebar-menu__root--visible': sidebarOpen,
-  });
+  if (!account) return null;
 
   return (
-    <div className={classes}>
+    <div className={classNames('sidebar-menu__root', {
+      'sidebar-menu__root--visible': sidebarOpen,
+    })}
+    >
       <div
         className={classNames({
           'fixed inset-0 bg-gray-600 bg-opacity-90 z-1000': true,
@@ -130,7 +131,7 @@ const SidebarMenu = () => {
               <HStack alignItems='center' justifyContent='between'>
                 <Link to='/' onClick={onClose}>
                   {logo ? (
-                    <img alt='Logo' src={logo} className='h-5 w-auto min-w-[140px] cursor-pointer' />
+                    <img alt='Logo' src={logo} className='h-5 w-auto cursor-pointer' />
                   ):  (
                     <Icon
                       alt='Logo'
@@ -150,10 +151,11 @@ const SidebarMenu = () => {
               </HStack>
 
               <Stack space={1}>
-                <Link to={`/@${acct}`} onClick={onClose}>
+                <Link to={`/@${account.acct}`} onClick={onClose}>
                   <Account account={account} showProfileHoverCard={false} />
                 </Link>
 
+                {/* TODO: make this available to everyone */}
                 {account.staff && (
                   <Stack>
                     <button type='button' onClick={handleSwitcherClick} className='py-1'>
@@ -184,12 +186,34 @@ const SidebarMenu = () => {
                 <hr />
 
                 <SidebarLink
-                  to={`/@${acct}`}
+                  to={`/@${account.acct}`}
                   icon={require('@tabler/icons/icons/user.svg')}
                   text={intl.formatMessage(messages.profile)}
                   onClick={onClose}
                 />
 
+                {(features.localTimeline || features.publicTimeline) && (
+                  <hr className='dark:border-slate-700' />
+                )}
+
+                {features.localTimeline && (
+                  <SidebarLink
+                    to='/timeline/local'
+                    icon={features.federating ? require('@tabler/icons/icons/users.svg') : require('@tabler/icons/icons/world.svg')}
+                    text={features.federating ? instance.title : <FormattedMessage id='tabs_bar.all' defaultMessage='All' />}
+                    onClick={onClose}
+                  />
+                )}
+
+                {(features.publicTimeline && features.federating) && (
+                  <SidebarLink
+                    to='/timeline/fediverse'
+                    icon={require('icons/fediverse.svg')}
+                    text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+                    onClick={onClose}
+                  />
+                )}
+
                 <hr />
 
                 <SidebarLink
diff --git a/app/soapbox/reducers/__tests__/sidebar-test.js b/app/soapbox/reducers/__tests__/sidebar-test.js
index 09cbc8d21..511325488 100644
--- a/app/soapbox/reducers/__tests__/sidebar-test.js
+++ b/app/soapbox/reducers/__tests__/sidebar-test.js
@@ -2,6 +2,6 @@ import reducer from '../sidebar';
 
 describe('sidebar reducer', () => {
   it('should return the initial state', () => {
-    expect(reducer(undefined, {})).toEqual({});
+    expect(reducer(undefined, {})).toEqual({ sidebarOpen: false });
   });
 });
diff --git a/app/soapbox/reducers/sidebar.js b/app/soapbox/reducers/sidebar.ts
similarity index 50%
rename from app/soapbox/reducers/sidebar.js
rename to app/soapbox/reducers/sidebar.ts
index 131411c2e..7b05e9c76 100644
--- a/app/soapbox/reducers/sidebar.js
+++ b/app/soapbox/reducers/sidebar.ts
@@ -1,6 +1,16 @@
 import { SIDEBAR_OPEN, SIDEBAR_CLOSE } from '../actions/sidebar';
 
-export default function sidebar(state={}, action) {
+import type { AnyAction } from 'redux';
+
+type State = {
+  sidebarOpen: boolean,
+};
+
+const initialState: State = {
+  sidebarOpen: false,
+};
+
+export default function sidebar(state: State = initialState, action: AnyAction): State {
   switch(action.type) {
   case SIDEBAR_OPEN:
     return { sidebarOpen: true };
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 468015696..94c0da574 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -68,6 +68,14 @@ const getInstanceFeatures = (instance: Instance) => {
       // Even though Pleroma supports these endpoints, it has disadvantages
       // v.software === PLEROMA && gte(v.version, '2.1.0'),
     ]),
+    localTimeline: any([
+      v.software === MASTODON,
+      v.software === PLEROMA,
+    ]),
+    publicTimeline: any([
+      v.software === MASTODON,
+      v.software === PLEROMA,
+    ]),
     directTimeline: any([
       v.software === MASTODON && lt(v.compatVersion, '3.0.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),