diff --git a/package-lock.json b/package-lock.json
index 713c9bb..8f12d4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -434,6 +434,17 @@
         "@babel/runtime": "^7.17.0"
       }
     },
+    "@reduxjs/toolkit": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.1.tgz",
+      "integrity": "sha512-Q6mzbTpO9nOYRnkwpDlFOAbQnd3g7zj7CtHAZWz5SzE5lcV97Tf8f3SzOO8BoPOMYBFgfZaqTUZqgGu+a0+Fng==",
+      "requires": {
+        "immer": "^9.0.7",
+        "redux": "^4.1.2",
+        "redux-thunk": "^2.4.1",
+        "reselect": "^4.1.5"
+      }
+    },
     "@rollup/pluginutils": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.0.tgz",
@@ -1495,6 +1506,11 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
     },
+    "immer": {
+      "version": "9.0.12",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
+      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA=="
+    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -2016,6 +2032,11 @@
         "@babel/runtime": "^7.9.2"
       }
     },
+    "redux-thunk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
+      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q=="
+    },
     "regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
@@ -2040,6 +2061,11 @@
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
     },
+    "reselect": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz",
+      "integrity": "sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="
+    },
     "resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
diff --git a/package.json b/package.json
index dd73d0d..9a8100a 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "@redux-devtools/extension": "^3.2.2",
+    "@reduxjs/toolkit": "^1.8.1",
     "eslint": "^7.32.0",
     "eslint-plugin-react": "^7.29.4",
     "react": "^17.0.2",
diff --git a/src/components/BlockEditor/BlockEditor.jsx b/src/components/BlockEditor/BlockEditor.jsx
index 57e25a4..1fa5961 100644
--- a/src/components/BlockEditor/BlockEditor.jsx
+++ b/src/components/BlockEditor/BlockEditor.jsx
@@ -3,7 +3,7 @@ import { React } from 'react';
 import { EditorCancel } from './EditorCancel';
 import { EditorSave } from './EditorSave';
 import { useDispatch, useSelector } from 'react-redux';
-import { changeLastBlock } from '../../store/actions';
+import { changeLastBlock } from '../../store/slice';
 
 export const BlockEditor = () => {
     const dispatch = useDispatch();
diff --git a/src/components/BlockEditor/EditorCancel.jsx b/src/components/BlockEditor/EditorCancel.jsx
index 3848059..35b99ca 100644
--- a/src/components/BlockEditor/EditorCancel.jsx
+++ b/src/components/BlockEditor/EditorCancel.jsx
@@ -1,6 +1,6 @@
 import { React } from 'react';
 import { useDispatch } from 'react-redux';
-import { changeModalVisible } from '../../store/actions';
+import { changeModalVisible } from '../../store/slice';
 
 export const EditorCancel = () => {
     const dispatch = useDispatch();
diff --git a/src/components/BlockEditor/EditorSave.jsx b/src/components/BlockEditor/EditorSave.jsx
index e460b07..a071a03 100644
--- a/src/components/BlockEditor/EditorSave.jsx
+++ b/src/components/BlockEditor/EditorSave.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { changeBlock, changeModalVisible } from '../../store/actions';
+import { changeBlock, changeModalVisible } from '../../store/slice';
 
 export const EditorSave = () => {
     const dispatch = useDispatch();
diff --git a/src/components/Blocks/Block.jsx b/src/components/Blocks/Block.jsx
index fec3bb6..0a59b89 100644
--- a/src/components/Blocks/Block.jsx
+++ b/src/components/Blocks/Block.jsx
@@ -1,7 +1,7 @@
 import { coordsToGrid, resize, resizeStop, setResizeCursor } from '../../blocks';
 import { React, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { changeBlock, changeLastBlock, changeModalVisible } from '../../store/actions';
+import { changeBlock, changeLastBlock, changeModalVisible } from '../../store/slice';
 
 export const Block = (props) => {
     const { blocks, settingsMode } = useSelector(state => state);
diff --git a/src/components/Blocks/Blocks.jsx b/src/components/Blocks/Blocks.jsx
index 516343a..bf55a5a 100644
--- a/src/components/Blocks/Blocks.jsx
+++ b/src/components/Blocks/Blocks.jsx
@@ -1,5 +1,5 @@
 import './blocks.css';
-
+import React from 'react';
 import { Block } from './Block';
 import { useSelector } from 'react-redux';
 
diff --git a/src/components/Settings/SettingsIcon.jsx b/src/components/Settings/SettingsIcon.jsx
index 17436fe..6506415 100644
--- a/src/components/Settings/SettingsIcon.jsx
+++ b/src/components/Settings/SettingsIcon.jsx
@@ -1,10 +1,10 @@
 import { React } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { settingsModeHandler } from '../../store/actions';
+import { settingsModeHandler } from '../../store/slice';
 
 export const SettingsIcon = () => {
     const dispatch = useDispatch();
-    const { settingsMode } = useSelector(state => state);
+    const settingsMode = useSelector(state => state.settingsMode);
     return (
         <button type="button" className={`settings-icon ${settingsMode ? 'settings-active' : ''}`}
             onClick={() => {
diff --git a/src/main.jsx b/src/main.jsx
index a2a7fc3..a24f4ed 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -3,12 +3,7 @@ import ReactDOM from 'react-dom';
 import './styles/style.css';
 import App from './components/App';
 import { Provider } from 'react-redux';
-import { createStore } from 'redux';
-import { devToolsEnhancer } from '@redux-devtools/extension';
-
-import { reducers } from './store/reducers';
-
-export const store = createStore(reducers, devToolsEnhancer());
+import { store } from './store/store';
 
 ReactDOM.render(
     <React.StrictMode>
diff --git a/src/store/actions.js b/src/store/actions.js
deleted file mode 100644
index 69784b0..0000000
--- a/src/store/actions.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export const MODAL_VISIBLE = 'MODAL_VISIBLE';
-export const SETTINGS_MODE = 'SETTINGS_MODE';
-export const CHANGE_BLOCK = 'CHANGE_BLOCK';
-
-export const LAST_BLOCK = 'LAST_BLOCK';
-
-export const changeLastBlock = (block) => {
-    return {
-        type: LAST_BLOCK,
-        lastBlock: block
-    };
-};
-
-export const changeBlock = (block) => {
-    return {
-        type: CHANGE_BLOCK,
-        payload: block
-    };
-};
-
-export const changeModalVisible = (isModalVisible) => {
-    return {
-        type: MODAL_VISIBLE,
-        modalVisible: isModalVisible
-    };
-};
-
-export const settingsModeHandler = (isSettingsMode) => {
-    return {
-        type: SETTINGS_MODE,
-        settingsMode: isSettingsMode
-    };
-};
diff --git a/src/store/reducers.js b/src/store/reducers.js
deleted file mode 100644
index bc7d7ef..0000000
--- a/src/store/reducers.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { combineReducers } from 'redux';
-import { defaultStore } from './store';
-import { CHANGE_BLOCK, LAST_BLOCK, MODAL_VISIBLE, SETTINGS_MODE } from './actions';
-
-/*eslint-disable */
-
-export const lastBlock = (state = defaultStore.lastBlock, action) => {
-    switch (action.type) {
-        case LAST_BLOCK:
-            return Object.assign({}, state, action.lastBlock)
-        default:
-            return state;
-    }
-};
-
-export const blocks = (state = defaultStore.blocks, action) => {
-    switch (action.type) {
-        case CHANGE_BLOCK: {
-                const newBlock = action.payload;
-                const newBlocks = state.slice();
-                return newBlocks.map((block) => {
-                    if (block.id === newBlock.id) return Object.assign({}, block, newBlock);
-                    return block;
-                });
-            }
-        default:
-            return state;
-    }
-}
-
-export const modalVisible = (state = defaultStore.modalVisible, action) => {
-    switch (action.type) {
-        case MODAL_VISIBLE:
-            return action.modalVisible;
-        default:
-            return state;
-    }
-};
-
-export const settingsMode = (state = defaultStore.settingsMode, action) => {
-    switch (action.type) {
-        case SETTINGS_MODE:
-            return action.settingsMode;
-        default:
-            return state;
-    }
-};
-
-export const reducers = combineReducers({
-    blocks,
-    modalVisible,
-    settingsMode,
-    lastBlock
-})
-
-/* eslint-enable */
diff --git a/src/store/slice.js b/src/store/slice.js
new file mode 100644
index 0000000..c325b8b
--- /dev/null
+++ b/src/store/slice.js
@@ -0,0 +1,227 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+const initialState = {
+    blocks: [
+        {
+            id: 1,
+            name: 'YouTube',
+            coords: {
+                x1: 1,
+                y1: 1,
+                x2: 1,
+                y2: 1
+            },
+            link: 'https://youtube.com',
+            design: {
+                name: {
+                    displayName: false,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: true,
+                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
+                    color: '#fff'
+                }
+            }
+        },
+        {
+            id: 2,
+            name: 'YouTube',
+            coords: {
+                x1: 2,
+                y1: 1,
+                x2: 2,
+                y2: 1
+            },
+            link: 'https://youtube.com',
+            design: {
+                name: {
+                    displayName: false,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: true,
+                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
+                    color: '#fff'
+                }
+            }
+        },
+        {
+            id: 3,
+            name: 'YouTube',
+            coords: {
+                x1: 3,
+                y1: 1,
+                x2: 4,
+                y2: 1
+            },
+            link: 'https://youtube.com',
+            design: {
+                name: {
+                    displayName: true,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: false,
+                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
+                    color: '#fff'
+                }
+            }
+        },
+        {
+            id: 4,
+            name: 'YouTube',
+            coords: {
+                x1: 5,
+                y1: 1,
+                x2: 6,
+                y2: 2
+            },
+            link: 'https://youtube.com',
+            design: {
+                name: {
+                    displayName: false,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: true,
+                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
+                    color: '#fff'
+                }
+            }
+        },
+        {
+            id: 5,
+            name: '',
+            coords: {
+                x1: 1,
+                y1: 2,
+                x2: 1,
+                y2: 2
+            },
+            link: '',
+            design: {
+                name: {
+                    displayName: false,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: true,
+                    image: '../src/img/add-block.svg',
+                    color: '#3A5967'
+                }
+            }
+        },
+        {
+            id: 6,
+            name: '',
+            coords: {
+                x1: 2,
+                y1: 2,
+                x2: 2,
+                y2: 2
+            },
+            link: '',
+            design: {
+                name: {
+                    displayName: false,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: true,
+                    image: '../src/img/add-block.svg',
+                    color: '#3A5967'
+                }
+            }
+        },
+        {
+            id: 7,
+            name: '',
+            coords: {
+                x1: 3,
+                y1: 2,
+                x2: 3,
+                y2: 2
+            },
+            link: '',
+            design: {
+                name: {
+                    displayName: false,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: true,
+                    image: '../src/img/add-block.svg',
+                    color: '#3A5967'
+                }
+            }
+        },
+        {
+            id: 8,
+            name: '',
+            coords: {
+                x1: 4,
+                y1: 2,
+                x2: 4,
+                y2: 2
+            },
+            link: '',
+            design: {
+                name: {
+                    displayName: false,
+                    fontColor: '#000000'
+                },
+                background: {
+                    displayImage: true,
+                    image: '../src/img/add-block.svg',
+                    color: '#3A5967'
+                }
+            }
+        }
+    ],
+    lastBlock: {
+        id: 0,
+        name: '',
+        link: '',
+        displayName: false,
+        fontColor: '#e4e3e9',
+        displayImage: false,
+        image: '../src/img/add-block.svg',
+        background: '#144973'
+    },
+    modalVisible: false,
+    settingsMode: false
+};
+
+export const mainSlice = createSlice({
+    name: 'main',
+    initialState,
+    reducers: {
+        changeLastBlock: (state, action) => {
+            state.lastBlock = Object.assign({}, state.lastBlock, action.payload);
+        },
+        changeBlock: (state, action) => {
+            const newBlock = action.payload;
+            state.blocks = state.blocks.map((block) => {
+                if (block.id === newBlock.id) return Object.assign({}, block, newBlock);
+                return block;
+            });
+        },
+        changeModalVisible: (state, action) => {
+            state.modalVisible = action.payload;
+        },
+        settingsModeHandler: (state, action) => {
+            state.settingsMode = action.payload;
+        }
+    }
+});
+
+const { actions, reducer } = mainSlice;
+
+export default reducer;
+export const {
+    changeLastBlock,
+    changeBlock,
+    changeModalVisible,
+    settingsModeHandler
+} = actions;
diff --git a/src/store/store.js b/src/store/store.js
index fc0adf1..6dc4e96 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -1,192 +1,7 @@
-export const defaultStore = {
-    blocks: [
-        {
-            id: 1,
-            name: 'YouTube',
-            coords: {
-                x1: 1,
-                y1: 1,
-                x2: 1,
-                y2: 1
-            },
-            link: 'https://youtube.com',
-            design: {
-                name: {
-                    displayName: false,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: true,
-                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
-                    color: '#fff'
-                }
-            }
-        },
-        {
-            id: 2,
-            name: 'YouTube',
-            coords: {
-                x1: 2,
-                y1: 1,
-                x2: 2,
-                y2: 1
-            },
-            link: 'https://youtube.com',
-            design: {
-                name: {
-                    displayName: false,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: true,
-                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
-                    color: '#fff'
-                }
-            }
-        },
-        {
-            id: 3,
-            name: 'YouTube',
-            coords: {
-                x1: 3,
-                y1: 1,
-                x2: 4,
-                y2: 1
-            },
-            link: 'https://youtube.com',
-            design: {
-                name: {
-                    displayName: true,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: false,
-                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
-                    color: '#fff'
-                }
-            }
-        },
-        {
-            id: 4,
-            name: 'YouTube',
-            coords: {
-                x1: 5,
-                y1: 1,
-                x2: 6,
-                y2: 2
-            },
-            link: 'https://youtube.com',
-            design: {
-                name: {
-                    displayName: false,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: true,
-                    image: 'https://www.youtube.com/img/desktop/yt_1200.png',
-                    color: '#fff'
-                }
-            }
-        },
-        {
-            id: 5,
-            name: '',
-            coords: {
-                x1: 1,
-                y1: 2,
-                x2: 1,
-                y2: 2
-            },
-            link: '',
-            design: {
-                name: {
-                    displayName: false,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: true,
-                    image: '../src/img/add-block.svg',
-                    color: '#3A5967'
-                }
-            }
-        },
-        {
-            id: 6,
-            name: '',
-            coords: {
-                x1: 2,
-                y1: 2,
-                x2: 2,
-                y2: 2
-            },
-            link: '',
-            design: {
-                name: {
-                    displayName: false,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: true,
-                    image: '../src/img/add-block.svg',
-                    color: '#3A5967'
-                }
-            }
-        },
-        {
-            id: 7,
-            name: '',
-            coords: {
-                x1: 3,
-                y1: 2,
-                x2: 3,
-                y2: 2
-            },
-            link: '',
-            design: {
-                name: {
-                    displayName: false,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: true,
-                    image: '../src/img/add-block.svg',
-                    color: '#3A5967'
-                }
-            }
-        },
-        {
-            id: 8,
-            name: '',
-            coords: {
-                x1: 4,
-                y1: 2,
-                x2: 4,
-                y2: 2
-            },
-            link: '',
-            design: {
-                name: {
-                    displayName: false,
-                    fontColor: '#000000'
-                },
-                background: {
-                    displayImage: true,
-                    image: '../src/img/add-block.svg',
-                    color: '#3A5967'
-                }
-            }
-        }
-    ],
-    lastBlock: {
-        id: 0,
-        name: '',
-        link: '',
-        displayName: false,
-        fontColor: '#e4e3e9',
-        displayImage: false,
-        image: '../src/img/add-block.svg',
-        background: '#144973'
-    },
-    modalVisible: false,
-    settingsMode: false
-};
+import { configureStore } from '@reduxjs/toolkit';
+import main from './slice';
+
+export const store = configureStore({
+    reducer: main,
+    devTools: process.env.NODE_ENV !== 'production'
+});