diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..4e872f20
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# Automatically assigned to any PRs
+* @davidcralph @alexsparkes
diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index 50b84f7c..572bb54d 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -16,11 +16,11 @@ jobs:
         with:
           chrome-version: latest
       - name: Download Github Release Assets
-        uses: plasmo-corp/download-release-asset@v1.0.0
+        uses: PlasmoHQ/download-release-asset@v1.0.0
         with:
           tag: ${{ github.event.inputs.tag }}
       - name: Browser Plugin Publish
-        uses: plasmo-corp/bpp@v1
+        uses: PlasmoHQ/bpp@v2
         env:
           PUPPETEER_EXECUTABLE_PATH: /opt/hostedtoolcache/chromium/latest/x64/chrome
         with:
diff --git a/LICENSE b/LICENSE
index a501da98..7c7f1b6d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
 BSD 3-Clause License
 
-Copyright (c) 2018-2022 The Mue Authors
+Copyright (c) 2018-2019 David Ralph
+Copyright (c) 2019-2022 The Mue Authors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index ad6f8170..bdf7a665 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,6 @@ Mue is a fast, open and free-to-use browser extension that gives a new, fresh an
 
 <br>
 
-## NOTICE
-
-This is the branch for the next version of Mue, 7.0. All development is occuring in this branch which will be merged into main when it is finished. If you want the current code, see the main branch.
-
 ## Table of contents
 
 - [NOTICE](#notice)
@@ -111,7 +107,11 @@ Please see the [documentation](https://docs.muetab.com/translations).
 [Austin Huang](https://github.com/austinhuang0131) - Chinese (Simplified) <br/>
 [FreeFun](https://github.com/xXFreeFunXx) - German <br/>
 [Aksal](https://github.com/aksalsf) - Indonesian <br/>
+<<<<<<< HEAD
 [Kağan Can Şit](https://github.com/KaganCanSit) - Turkish <br/>
+=======
+efeaydal - Turkish <br/>
+>>>>>>> main
 
 ### Contributors
 
diff --git a/manifest/chrome.json b/manifest/chrome.json
index 12815b26..b36f21be 100644
--- a/manifest/chrome.json
+++ b/manifest/chrome.json
@@ -4,7 +4,11 @@
   "default_locale": "en",
   "name": "__MSG_name__",
   "description": "__MSG_description__",
+<<<<<<< HEAD
   "version": "7.0.0",
+=======
+  "version": "6.0.6",
+>>>>>>> main
   "homepage_url": "https://muetab.com",
   "action": {
     "default_icon": "icons/128x128.png"
diff --git a/manifest/firefox.json b/manifest/firefox.json
index 91d89105..141ceef7 100644
--- a/manifest/firefox.json
+++ b/manifest/firefox.json
@@ -2,7 +2,11 @@
   "manifest_version": 3,
   "name": "Mue",
   "description": "Fast, open and free-to-use new tab page for modern browsers.",
+<<<<<<< HEAD
   "version": "7.0.0",
+=======
+  "version": "6.0.6",
+>>>>>>> main
   "homepage_url": "https://muetab.com",
   "action": {
     "default_icon": "icons/128x128.png"
diff --git a/package.json b/package.json
index 9374f71c..91840abb 100644
--- a/package.json
+++ b/package.json
@@ -9,25 +9,20 @@
   "homepage": "https://muetab.com",
   "bugs": "https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D",
   "license": "BSD-3-Clause",
-  "version": "7.0.0",
+  "version": "6.0.6",
   "dependencies": {
     "@eartharoid/i18n": "1.2.1",
-    "@emotion/react": "^11.10.5",
-    "@emotion/styled": "^11.10.5",
-    "@floating-ui/react-dom": "^1.0.1",
-    "@fontsource/lexend-deca": "4.5.12",
-    "@fontsource/montserrat": "4.5.13",
-    "@mui/material": "5.11.1",
-    "@sentry/react": "^7.21.1",
-    "embla-carousel-autoplay": "^7.0.5",
-    "embla-carousel-react": "^7.0.5",
-    "fast-blurhash": "^1.1.2",
-    "image-conversion": "^2.1.1",
-    "react": "^18.2.0",
+    "@emotion/react": "^11.9.0",
+    "@emotion/styled": "^11.8.1",
+    "@fontsource/lexend-deca": "4.4.5",
+    "@fontsource/montserrat": "4.4.5",
+    "@mui/material": "5.10.13",
+    "react": "18.2.0",
     "react-clock": "4.0.0",
     "react-color-gradient-picker": "0.1.2",
-    "react-dom": "^18.2.0",
-    "react-icons": "^4.6.0",
+    "react-dom": "18.2.0",
+    "react-hot-keys": "2.7.2",
+    "react-icons": "^4.3.1",
     "react-modal": "3.16.1",
     "react-sortable-hoc": "2.0.0",
     "react-toastify": "9.1.1"
@@ -36,16 +31,19 @@
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
     "@eartharoid/deep-merge": "^0.0.2",
-    "@vitejs/plugin-react": "3.0.0",
-    "eslint": "^8.30.0",
-    "eslint-config-react-app": "^7.0.1",
-    "husky": "^8.0.2",
-    "prettier": "^2.8.1",
-    "sass": "^1.57.1",
-    "stylelint": "^14.16.0",
-    "stylelint-config-prettier-scss": "^0.0.1",
-    "stylelint-config-standard-scss": "^6.1.0",
-    "vite": "4.0.3"
+    "babel-loader": "^9.0.0",
+    "copy-webpack-plugin": "9.1.0",
+    "css-loader": "^6.7.1",
+    "eslint": "^8.12.0",
+    "eslint-config-react-app": "^7.0.0",
+    "html-webpack-plugin": "^5.5.0",
+    "mini-css-extract-plugin": "^2.6.0",
+    "sass": "^1.50.0",
+    "sass-loader": "^13.0.0",
+    "source-map-loader": "^4.0.0",
+    "webpack": "^5.71.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.8.1"
   },
   "scripts": {
     "dev": "vite",