diff --git a/platform/viewer/src/App.js b/platform/viewer/src/App.js
index 4c3373500..5cf93cc9d 100644
--- a/platform/viewer/src/App.js
+++ b/platform/viewer/src/App.js
@@ -1,330 +1,14 @@
-import React, { Component } from 'react';
-import { OidcProvider } from 'redux-oidc';
-import { I18nextProvider } from 'react-i18next';
-import PropTypes from 'prop-types';
-import { Provider } from 'react-redux';
-import { BrowserRouter as Router } from 'react-router-dom';
-import { hot } from 'react-hot-loader/root';
+import React from 'react';
+import { ThemeWrapper } from '@ohif/ui';
 
-import OHIFCornerstoneExtension from '@ohif/extension-cornerstone';
+import ConnectedStudyList from './connectedComponents/ConnectedStudyList';
 
-import {
-  SnackbarProvider,
-  ModalProvider,
-  DialogProvider,
-  OHIFModal,
-} from '@ohif/ui';
-
-import {
-  CommandsManager,
-  ExtensionManager,
-  ServicesManager,
-  HotkeysManager,
-  UINotificationService,
-  UIModalService,
-  UIDialogService,
-  MeasurementService,
-  utils,
-  redux as reduxOHIF,
-} from '@ohif/core';
-
-import i18n from '@ohif/i18n';
-
-// TODO: This should not be here
-//import './config';
-import { setConfiguration } from './config';
-
-/** Utils */
-import {
-  getUserManagerForOpenIdConnectClient,
-  initWebWorkers,
-} from './utils/index.js';
-
-/** Extensions */
-import { GenericViewerCommands, MeasurementsPanel } from './appExtensions';
-
-/** Viewer */
-import OHIFStandaloneViewer from './OHIFStandaloneViewer';
-
-/** Store */
-import { getActiveContexts } from './store/layout/selectors.js';
-import store from './store';
-
-/** Contexts */
-import WhiteLabelingContext from './context/WhiteLabelingContext';
-import UserManagerContext from './context/UserManagerContext';
-import { AppProvider, useAppContext, CONTEXTS } from './context/AppContext';
-
-/** ~~~~~~~~~~~~~ Application Setup */
-const commandsManagerConfig = {
-  getAppState: () => store.getState(),
-  getActiveContexts: () => getActiveContexts(store.getState()),
+const App = () => {
+  return (
+    <ThemeWrapper>
+      <ConnectedStudyList />
+    </ThemeWrapper>
+  );
 };
 
-/** Managers */
-const commandsManager = new CommandsManager(commandsManagerConfig);
-const servicesManager = new ServicesManager();
-const hotkeysManager = new HotkeysManager(commandsManager, servicesManager);
-let extensionManager;
-/** ~~~~~~~~~~~~~ End Application Setup */
-
-// TODO[react] Use a provider when the whole tree is React
-window.store = store;
-
-class App extends Component {
-  static propTypes = {
-    config: PropTypes.oneOfType([
-      PropTypes.func,
-      PropTypes.shape({
-        routerBasename: PropTypes.string.isRequired,
-        oidc: PropTypes.array,
-        whiteLabeling: PropTypes.shape({
-          createLogoComponentFn: PropTypes.func,
-        }),
-        extensions: PropTypes.array,
-      }),
-    ]).isRequired,
-    defaultExtensions: PropTypes.array,
-  };
-
-  static defaultProps = {
-    config: {
-      showStudyList: true,
-      oidc: [],
-      extensions: [],
-    },
-    defaultExtensions: [],
-  };
-
-  _appConfig;
-  _userManager;
-
-  constructor(props) {
-    super(props);
-
-    const { config, defaultExtensions } = props;
-
-    const appDefaultConfig = {
-      showStudyList: true,
-      cornerstoneExtensionConfig: {},
-      extensions: [],
-      routerBasename: '/',
-    };
-
-    this._appConfig = {
-      ...appDefaultConfig,
-      ...(typeof config === 'function' ? config({ servicesManager }) : config),
-    };
-
-    const {
-      servers,
-      hotkeys: appConfigHotkeys,
-      cornerstoneExtensionConfig,
-      extensions,
-      oidc,
-    } = this._appConfig;
-
-    setConfiguration(this._appConfig);
-
-    this.initUserManager(oidc);
-    _initServices([
-      UINotificationService,
-      UIModalService,
-      UIDialogService,
-      MeasurementService,
-    ]);
-    _initExtensions(
-      [...defaultExtensions, ...extensions],
-      cornerstoneExtensionConfig,
-      this._appConfig
-    );
-
-    /*
-     * Must run after extension commands are registered
-     * if there is no hotkeys from localStorage set up from config.
-     */
-    _initHotkeys(appConfigHotkeys);
-    _initServers(servers);
-    initWebWorkers();
-  }
-
-  render() {
-    const { whiteLabeling, routerBasename } = this._appConfig;
-    const {
-      UINotificationService,
-      UIDialogService,
-      UIModalService,
-      MeasurementService,
-    } = servicesManager.services;
-
-    if (this._userManager) {
-      return (
-        <Provider store={store}>
-          <AppProvider config={this._appConfig}>
-            <I18nextProvider i18n={i18n}>
-              <OidcProvider store={store} userManager={this._userManager}>
-                <UserManagerContext.Provider value={this._userManager}>
-                  <Router basename={routerBasename}>
-                    <WhiteLabelingContext.Provider value={whiteLabeling}>
-                      <SnackbarProvider service={UINotificationService}>
-                        <DialogProvider service={UIDialogService}>
-                          <ModalProvider
-                            modal={OHIFModal}
-                            service={UIModalService}
-                          >
-                            <OHIFStandaloneViewer
-                              userManager={this._userManager}
-                            />
-                          </ModalProvider>
-                        </DialogProvider>
-                      </SnackbarProvider>
-                    </WhiteLabelingContext.Provider>
-                  </Router>
-                </UserManagerContext.Provider>
-              </OidcProvider>
-            </I18nextProvider>
-          </AppProvider>
-        </Provider>
-      );
-    }
-
-    return (
-      <Provider store={store}>
-        <AppProvider config={this._appConfig}>
-          <I18nextProvider i18n={i18n}>
-            <Router basename={routerBasename}>
-              <WhiteLabelingContext.Provider value={whiteLabeling}>
-                <SnackbarProvider service={UINotificationService}>
-                  <DialogProvider service={UIDialogService}>
-                    <ModalProvider modal={OHIFModal} service={UIModalService}>
-                      <OHIFStandaloneViewer />
-                    </ModalProvider>
-                  </DialogProvider>
-                </SnackbarProvider>
-              </WhiteLabelingContext.Provider>
-            </Router>
-          </I18nextProvider>
-        </AppProvider>
-      </Provider>
-    );
-  }
-
-  initUserManager(oidc) {
-    if (oidc && !!oidc.length) {
-      const firstOpenIdClient = this._appConfig.oidc[0];
-
-      const { protocol, host } = window.location;
-      const { routerBasename } = this._appConfig;
-      const baseUri = `${protocol}//${host}${routerBasename}`;
-
-      const redirect_uri = firstOpenIdClient.redirect_uri || '/callback';
-      const silent_redirect_uri =
-        firstOpenIdClient.silent_redirect_uri || '/silent-refresh.html';
-      const post_logout_redirect_uri =
-        firstOpenIdClient.post_logout_redirect_uri || '/';
-
-      const openIdConnectConfiguration = Object.assign({}, firstOpenIdClient, {
-        redirect_uri: _makeAbsoluteIfNecessary(redirect_uri, baseUri),
-        silent_redirect_uri: _makeAbsoluteIfNecessary(
-          silent_redirect_uri,
-          baseUri
-        ),
-        post_logout_redirect_uri: _makeAbsoluteIfNecessary(
-          post_logout_redirect_uri,
-          baseUri
-        ),
-      });
-
-      this._userManager = getUserManagerForOpenIdConnectClient(
-        store,
-        openIdConnectConfiguration
-      );
-    }
-  }
-}
-
-function _initServices(services) {
-  servicesManager.registerServices(services);
-}
-
-/**
- * @param
- */
-function _initExtensions(extensions, cornerstoneExtensionConfig, appConfig) {
-  extensionManager = new ExtensionManager({
-    commandsManager,
-    servicesManager,
-    appConfig,
-    api: {
-      contexts: CONTEXTS,
-      hooks: {
-        useAppContext
-      }
-    }
-  });
-
-  const requiredExtensions = [
-    GenericViewerCommands,
-    [OHIFCornerstoneExtension, cornerstoneExtensionConfig],
-    /* WARNING: MUST BE REGISTERED _AFTER_ OHIFCornerstoneExtension */
-    MeasurementsPanel,
-  ];
-  const mergedExtensions = requiredExtensions.concat(extensions);
-  extensionManager.registerExtensions(mergedExtensions);
-}
-
-/**
- *
- * @param {Object} appConfigHotkeys - Default hotkeys, as defined by app config
- */
-function _initHotkeys(appConfigHotkeys) {
-  // TODO: Use something more resilient
-  // TODO: Mozilla has a special library for this
-  const userPreferredHotkeys = JSON.parse(
-    localStorage.getItem('hotkey-definitions') || '{}'
-  );
-
-  // TODO: hotkeysManager.isValidDefinitionObject(/* */)
-  const hasUserPreferences =
-    userPreferredHotkeys && Object.keys(userPreferredHotkeys).length > 0;
-  if (hasUserPreferences) {
-    hotkeysManager.setHotkeys(userPreferredHotkeys);
-  } else {
-    hotkeysManager.setHotkeys(appConfigHotkeys);
-  }
-
-  hotkeysManager.setDefaultHotKeys(appConfigHotkeys);
-}
-
-function _initServers(servers) {
-  if (servers) {
-    utils.addServers(servers, store);
-  }
-}
-
-function _isAbsoluteUrl(url) {
-  return url.includes('http://') || url.includes('https://');
-}
-
-function _makeAbsoluteIfNecessary(url, base_url) {
-  if (_isAbsoluteUrl(url)) {
-    return url;
-  }
-
-  /*
-   * Make sure base_url and url are not duplicating slashes.
-   */
-  if (base_url[base_url.length - 1] === '/') {
-    base_url = base_url.slice(0, base_url.length - 1);
-  }
-
-  return base_url + url;
-}
-
-/*
- * Only wrap/use hot if in dev.
- */
-const ExportedApp = process.env.NODE_ENV === 'development' ? hot(App) : App;
-
-export default ExportedApp;
-export { commandsManager, extensionManager, hotkeysManager, servicesManager };
+export default App;
diff --git a/platform/viewer/src/index.js b/platform/viewer/src/index.js
index 4b6afde12..1ad62a251 100644
--- a/platform/viewer/src/index.js
+++ b/platform/viewer/src/index.js
@@ -23,13 +23,10 @@ import ReactDOM from 'react-dom';
  * by using the exported `App` component, and passing in your extensions as props using
  * the defaultExtensions property.
  */
-import OHIFVTKExtension from '@ohif/extension-vtk';
-import OHIFDicomHtmlExtension from '@ohif/extension-dicom-html';
-import OHIFDicomSegmentationExtension from '@ohif/extension-dicom-segmentation';
-import OHIFDicomRtExtension from '@ohif/extension-dicom-rt';
-import OHIFDicomMicroscopyExtension from '@ohif/extension-dicom-microscopy';
-import OHIFDicomPDFExtension from '@ohif/extension-dicom-pdf';
-import OHIFDicomP10DownloaderExtension from '@ohif/extension-dicom-p10-downloader';
+// import OHIFVTKExtension from '@ohif/extension-vtk';
+// import OHIFDicomHtmlExtension from '@ohif/extension-dicom-html';
+// import OHIFDicomMicroscopyExtension from '@ohif/extension-dicom-microscopy';
+// import OHIFDicomPDFExtension from '@ohif/extension-dicom-pdf';
 
 /*
  * Default Settings
@@ -42,15 +39,12 @@ if (window) {
 
 const appProps = {
   config,
-  defaultExtensions: [
-    OHIFVTKExtension,
-    OHIFDicomHtmlExtension,
-    OHIFDicomMicroscopyExtension,
-    OHIFDicomPDFExtension,
-    OHIFDicomSegmentationExtension,
-    OHIFDicomRtExtension,
-    OHIFDicomP10DownloaderExtension,
-  ],
+  // defaultExtensions: [
+  //   OHIFVTKExtension,
+  //   OHIFDicomHtmlExtension,
+  //   OHIFDicomMicroscopyExtension,
+  //   OHIFDicomPDFExtension,
+  // ],
 };
 
 /** Create App */