diff --git a/packages/core/admin/admin/src/plugins.js b/packages/core/admin/admin/src/plugins.js
index 0b3059d2cc..f595fe116a 100644
--- a/packages/core/admin/admin/src/plugins.js
+++ b/packages/core/admin/admin/src/plugins.js
@@ -3,9 +3,11 @@ import documentationPlugin from '../../../../plugins/documentation/admin/src';
 import graphqlPlugin from '../../../../plugins/graphql/admin/src';
 import sentryPlugin from '../../../../plugins/sentry/admin/src';
 import usersPermissionsPlugin from '../../../../plugins/users-permissions/admin/src';
+import cmPlugin from '../../../content-manager/admin/src';
 import emailPlugin from '../../../email/admin/src';
 
 const plugins = {
+  '@strapi/plugin-content-manager': cmPlugin,
   '@strapi/plugin-documentation': documentationPlugin,
   '@strapi/plugin-email': emailPlugin,
   '@strapi/plugin-graphql': graphqlPlugin,
diff --git a/packages/core/content-manager/admin/src/components/Inputs/index.js b/packages/core/content-manager/admin/src/components/Inputs/index.js
index c10d170bc1..d870ca8d2c 100644
--- a/packages/core/content-manager/admin/src/components/Inputs/index.js
+++ b/packages/core/content-manager/admin/src/components/Inputs/index.js
@@ -174,7 +174,8 @@ function Inputs({
   ]);
 
   const otherFields = useMemo(() => {
-    return fieldApi.getFields();
+    // return fieldApi.getFields();
+    return {};
   }, [fieldApi]);
 
   const { description, visible } = metadatas;
diff --git a/packages/core/content-manager/admin/src/containers/EditViewLayoutManager/selectors.js b/packages/core/content-manager/admin/src/containers/EditViewLayoutManager/selectors.js
index 6d44325b79..e8a8011197 100644
--- a/packages/core/content-manager/admin/src/containers/EditViewLayoutManager/selectors.js
+++ b/packages/core/content-manager/admin/src/containers/EditViewLayoutManager/selectors.js
@@ -1,5 +1,5 @@
 import pluginId from '../../pluginId';
 
-const selectLayout = state => state.get(`${pluginId}_editViewLayoutManager`).currentLayout;
+const selectLayout = state => state.[`${pluginId}_editViewLayoutManager`].currentLayout;
 
 export default selectLayout;
diff --git a/packages/core/content-manager/admin/src/containers/ListView/selectors.js b/packages/core/content-manager/admin/src/containers/ListView/selectors.js
index eaedece71a..da6b6143a1 100644
--- a/packages/core/content-manager/admin/src/containers/ListView/selectors.js
+++ b/packages/core/content-manager/admin/src/containers/ListView/selectors.js
@@ -5,7 +5,7 @@ import { initialState } from './reducer';
 /**
  * Direct selector to the listView state domain
  */
-const listViewDomain = () => state => state.get(`${pluginId}_listView`) || initialState;
+const listViewDomain = () => state => state[`${pluginId}_listView`] || initialState;
 
 /**
  * Other specific selectors
diff --git a/packages/core/content-manager/admin/src/containers/Main/selectors.js b/packages/core/content-manager/admin/src/containers/Main/selectors.js
index b0a3fa9022..8d6e83473d 100644
--- a/packages/core/content-manager/admin/src/containers/Main/selectors.js
+++ b/packages/core/content-manager/admin/src/containers/Main/selectors.js
@@ -3,7 +3,7 @@ import pluginId from '../../pluginId';
 import { initialState } from './reducer';
 
 const selectMainDomain = () => state => {
-  return state.get(`${pluginId}_main`) || initialState;
+  return state[`${pluginId}_main`] || initialState;
 };
 
 const makeSelectMain = () =>
diff --git a/packages/core/content-manager/admin/src/hooks/useFindRedirectionLink/selectors.js b/packages/core/content-manager/admin/src/hooks/useFindRedirectionLink/selectors.js
index 857c325c94..762110e486 100644
--- a/packages/core/content-manager/admin/src/hooks/useFindRedirectionLink/selectors.js
+++ b/packages/core/content-manager/admin/src/hooks/useFindRedirectionLink/selectors.js
@@ -1,5 +1,5 @@
 const selectMenuLinks = state => {
-  const menuState = state.get('menu');
+  const menuState = state.menu;
 
   return menuState.collectionTypesSectionLinks;
 };
diff --git a/packages/core/content-manager/admin/src/index.js b/packages/core/content-manager/admin/src/index.js
index cc0fc01123..31c12446ba 100644
--- a/packages/core/content-manager/admin/src/index.js
+++ b/packages/core/content-manager/admin/src/index.js
@@ -9,44 +9,80 @@ import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 import pluginLogo from './assets/images/logo.svg';
 import App from './containers/Main';
-
 import ConfigureViewButton from './InjectedComponents/ContentTypeBuilder/ConfigureViewButton';
-import lifecycles from './lifecycles';
 import reducers from './reducers';
 import trads from './translations';
 
-export default strapi => {
-  const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
-  const plugin = {
-    blockerComponent: null,
-    blockerComponentProps: {},
-    description: pluginDescription,
-    icon: pluginPkg.strapi.icon,
-    id: pluginId,
-    initializer: null,
-    injectedComponents: [
-      {
-        plugin: 'content-type-builder.listView',
-        area: 'list.link',
-        component: ConfigureViewButton,
-        key: 'content-manager.link',
-      },
-    ],
-    injectionZones: {
-      editView: { informations: [] },
-      listView: { actions: [], deleteModalAdditionalInfos: [] },
-    },
-    isReady: true,
-    isRequired: pluginPkg.strapi.required || false,
-    layout: null,
-    lifecycles,
-    mainComponent: App,
-    name: pluginPkg.strapi.name,
-    pluginLogo,
-    preventComponentRendering: false,
-    reducers,
-    trads,
-  };
+const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+const icon = pluginPkg.strapi.icon;
+const name = pluginPkg.strapi.name;
 
-  return strapi.registerPlugin(plugin);
+export default {
+  register(app) {
+    app.addReducers(reducers);
+
+    app.registerPlugin({
+      description: pluginDescription,
+      icon,
+      id: pluginId,
+      // TODO
+      injectedComponents: [
+        {
+          plugin: 'content-type-builder.listView',
+          area: 'list.link',
+          component: ConfigureViewButton,
+          key: 'content-manager.link',
+        },
+      ],
+      injectionZones: {
+        editView: { informations: [] },
+        listView: { actions: [], deleteModalAdditionalInfos: [] },
+      },
+      isReady: true,
+      isRequired: pluginPkg.strapi.required || false,
+      mainComponent: App,
+      name,
+      pluginLogo,
+      preventComponentRendering: false,
+      // reducers,
+      trads,
+    });
+  },
+  boot() {},
 };
+
+// export default strapi => {
+//   const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+//   const plugin = {
+//     blockerComponent: null,
+//     blockerComponentProps: {},
+//     description: pluginDescription,
+//     icon: pluginPkg.strapi.icon,
+//     id: pluginId,
+//     initializer: null,
+//     injectedComponents: [
+//       {
+//         plugin: 'content-type-builder.listView',
+//         area: 'list.link',
+//         component: ConfigureViewButton,
+//         key: 'content-manager.link',
+//       },
+//     ],
+//     injectionZones: {
+//       editView: { informations: [] },
+//       listView: { actions: [], deleteModalAdditionalInfos: [] },
+//     },
+//     isReady: true,
+//     isRequired: pluginPkg.strapi.required || false,
+//     layout: null,
+
+//     mainComponent: App,
+//     name: pluginPkg.strapi.name,
+//     pluginLogo,
+//     preventComponentRendering: false,
+//     reducers,
+//     trads,
+//   };
+
+//   return strapi.registerPlugin(plugin);
+// };
diff --git a/packages/core/content-manager/admin/src/selectors.js b/packages/core/content-manager/admin/src/selectors.js
index c9c1d3ca77..4f0296c725 100644
--- a/packages/core/content-manager/admin/src/selectors.js
+++ b/packages/core/content-manager/admin/src/selectors.js
@@ -1,6 +1,6 @@
 import pluginId from './pluginId';
 
-export const selectPermissions = state => state.get(`${pluginId}_rbacManager`).permissions;
+export const selectPermissions = state => state[`${pluginId}_rbacManager`].permissions;
 
 export const selectCollectionTypePermissions = state =>
-  state.get('permissionsManager').collectionTypesRelatedPermissions;
+  state.permissionsManager.collectionTypesRelatedPermissions;
diff --git a/packages/core/content-manager/admin/src/sharedReducers/crudReducer/selectors.js b/packages/core/content-manager/admin/src/sharedReducers/crudReducer/selectors.js
index 0669de9051..31a3823f07 100644
--- a/packages/core/content-manager/admin/src/sharedReducers/crudReducer/selectors.js
+++ b/packages/core/content-manager/admin/src/sharedReducers/crudReducer/selectors.js
@@ -1,5 +1,5 @@
 import pluginId from '../../pluginId';
 
-const selectCrudReducer = state => state.get(`${pluginId}_editViewCrudReducer`);
+const selectCrudReducer = state => state[`${pluginId}_editViewCrudReducer`];
 
 export default selectCrudReducer;
diff --git a/packages/core/helper-plugin/lib/src/components/InputSelect/Select.js b/packages/core/helper-plugin/lib/src/components/InputSelect/Select.js
index 8ca10cc1eb..10f0d05d7a 100644
--- a/packages/core/helper-plugin/lib/src/components/InputSelect/Select.js
+++ b/packages/core/helper-plugin/lib/src/components/InputSelect/Select.js
@@ -8,7 +8,7 @@ const Select = styled.select`
   padding-left: 1rem;
   background-position: right -1px center;
   background-repeat: no-repeat;
-  background-image: url(${Bkg});
+  background-image: url("${Bkg}");
   border: 1px solid #e3e9f3;
   border-radius: 0.25rem;
   line-height: 3.2rem;
diff --git a/packages/core/helper-plugin/lib/src/components/LiLink/StyledLink.js b/packages/core/helper-plugin/lib/src/components/LiLink/StyledLink.js
index 6d0bb1b479..a0934c6c9c 100644
--- a/packages/core/helper-plugin/lib/src/components/LiLink/StyledLink.js
+++ b/packages/core/helper-plugin/lib/src/components/LiLink/StyledLink.js
@@ -21,7 +21,7 @@ const StyledLink = styled(Link)`
   }
   .layout {
     display: inline-block;
-    background-image: url(${Layout});
+    background-image: url("${Layout}");
   }
   &:hover {
     text-decoration: none;
@@ -31,7 +31,7 @@ const StyledLink = styled(Link)`
       color: #007eff;
     }
     .layout {
-      background-image: url(${LayoutHover});
+      background-image: url("${LayoutHover}");
     }
   }
 `;
diff --git a/packages/core/helper-plugin/lib/src/components/PageFooter/Wrapper.js b/packages/core/helper-plugin/lib/src/components/PageFooter/Wrapper.js
index e15fe2a40b..19ba881721 100644
--- a/packages/core/helper-plugin/lib/src/components/PageFooter/Wrapper.js
+++ b/packages/core/helper-plugin/lib/src/components/PageFooter/Wrapper.js
@@ -18,6 +18,7 @@ const Wrapper = styled.div`
     display: flex;
 
     > select {
+      background-image: url("${Bkg}");
       width: 75px !important;
       height: 3.2rem !important;
       padding-top: 0rem;
@@ -25,7 +26,6 @@ const Wrapper = styled.div`
       padding-right: 3rem;
       background-position: right -1px center;
       background-repeat: no-repeat;
-      background-image: url(${Bkg});
       border: 1px solid #e3e9f3;
       border-radius: 0.25rem;
       line-height: 29px;