diff --git a/.gitmodules b/.gitmodules
index bbbd327..df078cb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "emiyl-theme"]
-	path = emiyl-theme
-	url = https://github.com/emiyl/emiyl-theme
+[submodule "emiyl-theme-2"]
+	path = emiyl-theme-2
+	url = https://github.com/emiyl/emiyl-theme-2
diff --git a/docs/.vuepress/components/Tab.vue b/docs/.vuepress/components/Tab.vue
deleted file mode 100644
index db6e167..0000000
--- a/docs/.vuepress/components/Tab.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-	<section>
-		<input :id="parentId + '-' + id" :name="parentId" type="radio" :checked="active">
-		<label :for="parentId + '-' + id" class="tab-link" v-html="name" v-on:click="this.setTab()"></label>
-		<div class="tab"><slot /></div>
-	</section>
-</template>
-
-<script>
-	export default {
-		props: {
-			name: { required: true },
-			default: { default: false }
-		},
-
-		data: () => ({
-			active: false
-		}),
-
-		computed: {
-			id() { return this.name.toLowerCase().replace(/ /g, '-'); },
-			parentId() { return this.$parent.$parent.$props.id.toLowerCase().replace(/ /g, '-'); },
-			parentIdSafe() { return this.parentId.replace(/[\-\/\\^$*+?.()|[\]{}]/g, "\\$&"); }
-		},
-
-		created() {
-			this.active = this.default === "";
-		},
-
-		mounted() {
-			// Try to get tab from URL
-			const urlTab = decodeURI(window.location.href).match(RegExp(`[?&]${this.parentIdSafe}=(.*?)(?=\&|#|$)`));
-			if(urlTab && urlTab.length > 1) {
-				if(urlTab[1] === this.id)
-					this.active = true;
-			}
-			if (this.default) this.active = true
-		},
-
-		methods: {
-			setTab() {
-				let url = window.location.href;
-				if(url.match(RegExp(`[?&]${this.parentIdSafe}=`))) { // Already has a tab param
-					url = url.replace(RegExp(`([?&]${this.parentIdSafe}=)(.*?)(?=\&|#|$)`), "$1" + this.id)
-				} else if(url.match(/\?/)) { // Already has other search params
-					url = url.replace(/[?&].*?(?=#|$)/, `$&&${this.parentId}=` + this.id);
-				} else { // No search params
-					url = url.replace(/(?=#|$)/, `?${this.parentId}=` + this.id);
-				}
-	
-				if(url != window.location.href) { // Don't update if not changed
-					history.pushState({}, "", encodeURI(url));
-				}
-			}
-		}
-	};
-</script>
diff --git a/docs/.vuepress/components/Tabs.vue b/docs/.vuepress/components/Tabs.vue
deleted file mode 100644
index 82c2950..0000000
--- a/docs/.vuepress/components/Tabs.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-	<div class="tab-container">
-		<slot />
-	</div>
-</template>
-
-<script>
-	export default {
-		props: {
-			id: { default: "tab" }
-		}
-	};
-</script>
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 2325e79..60939bc 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,14 +1,10 @@
-const { localePath, locales, themeConfigLocales, searchLocales } = require("./i18n")
-const container = require('markdown-it-container')
-const { path, fs } = require('@vuepress/utils')
-const { searchPlugin } = require('@vuepress/plugin-search')
-const { registerComponentsPlugin } = require('@vuepress/plugin-register-components')
-const { localTheme } = require('../../emiyl-theme')
+const { locales, themeConfigLocales } = require("./i18n")
+const { emiylTheme } = require('../../emiyl-theme-2')
 
 module.exports = {
   locales: locales,
   
-  theme: localTheme({
+  theme: emiylTheme({
     repo: 'cfw-guide/cemu.cfw.guide',
     selectLanguageText: '<i class="fas fa-globe"></i>',
     locales: themeConfigLocales,
@@ -17,13 +13,6 @@ module.exports = {
       "8442"
     ]
   }),
-
-	plugins: [
-    searchPlugin({locales: searchLocales}),
-    registerComponentsPlugin({
-      componentsDir: path.resolve(__dirname, './components'),
-    }),
-	],
   
   head: [
     ['link', { rel: 'stylesheet', href: 'https://use.fontawesome.com/releases/v5.6.1/css/all.css' } ],
@@ -32,30 +21,4 @@ module.exports = {
   ],
 
   shouldPrefetch: true,
-
-  extendsMarkdown: (md) => {
-    md.use(require('markdown-it-include'))
-
-    md.use(container, "tabs", {
-      render: (tokens, idx) => {
-        const token = tokens[idx];
-        if (token.nesting === 1) {
-          return `<Tabs ${token.info}>\n`;
-        } else {
-          return `</Tabs>\n`;
-        }
-      }
-    });
-  
-    md.use(container, 'tab', {
-      render: (tokens, idx) => {
-        const token = tokens[idx];
-        if (token.nesting === 1) {
-          return `<Tab ${token.info}>\n`;
-        } else {
-          return `</Tab>\n`;
-        }
-      }
-    });
-  },
 }
diff --git a/docs/.vuepress/plugins/redirectPlugin/lib/client.js b/docs/.vuepress/plugins/redirectPlugin/lib/client.js
deleted file mode 100644
index a911aaf..0000000
--- a/docs/.vuepress/plugins/redirectPlugin/lib/client.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { defineClientConfig } from '@vuepress/client'
-import pages from '@temp/pages'
-
-var redirectArr = []
-for (var i in pages) {
-    var redObj = {
-        path: [],
-        redirect: ''
-    }
-    
-    const p = pages[i]
-    if (!p.hasOwnProperty('redirect_from')) continue
-    if (p.redirect_from == null) continue
-    redObj.redirect = p.path
-    
-    if (Array.isArray(p.redirect_from)) {
-    for (var j in p.redirect_from) {
-        if (p.redirect_from[j].length < 1) continue;
-        redObj.path.push(p.redirect_from[j])
-    }
-    } else {
-    if (p.redirect_from.length < 1) continue
-    redObj.path.push(p.redirect_from)
-    }
-    
-    if (!redObj.path.length) continue
-    
-    redirectArr.push(redObj)
-}
-
-export default defineClientConfig({
-    enhance({ router }) {
-        for (const redObj of redirectArr) for (const path of redObj.path) {
-            router.addRoute({ path: path, redirect: redObj.redirect })
-        }
-    }
-})
\ No newline at end of file
diff --git a/docs/.vuepress/plugins/redirectPlugin/lib/index.js b/docs/.vuepress/plugins/redirectPlugin/lib/index.js
deleted file mode 100644
index 98f52a3..0000000
--- a/docs/.vuepress/plugins/redirectPlugin/lib/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const { path } = require('@vuepress/utils')
-
-module.exports = {
-    onInitialized: async (app) => {
-        const pages = app.pages
-        var retArr = []
-    
-        for (const i in pages) {
-            const page = pages[i]
-            var pageObj = {}
-            pageObj.path = page.path
-
-            if (page.hasOwnProperty('frontmatter') && page.frontmatter.hasOwnProperty('redirect_from'))
-                pageObj.redirect_from = page.frontmatter.redirect_from
-            else
-                continue
-
-            retArr.push(pageObj)
-        }
-        await app.writeTemp('pages.js', `export default ${JSON.stringify(retArr)}`)
-    },
-    clientConfigFile: path.resolve(__dirname, './client.js'),
-}
\ No newline at end of file
diff --git a/docs/.vuepress/styles/index.scss b/docs/.vuepress/styles/index.scss
deleted file mode 100644
index 89fcfcf..0000000
--- a/docs/.vuepress/styles/index.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-.credits {
-	margin-top: 2em;
-	display: table;
-	width: 50%;
-	table-layout: fixed;
-	border-spacing: 0.2em;
-	margin-left: auto;
-	margin-right: auto;
-
-	i {
-		font-size: 20px;
-		padding-top: 1em;
-		margin-left: 5px;
-		margin-right: 5px;
-	}
-}
-
-.user {
-	display: table-cell;
-	margin: auto;
-	text-align: center;
-	vertical-align: middle;
-	a, a:hover {
-		text-decoration: none !important;
-	}
-	img {
-		border-radius: 50%;
-		width: 80%;
-	}
-	h3 {
-		margin: 0.3em !important;
-	}
-	p {
-		opacity: 0.65;
-		margin-bottom: 0px !important;
-	}
-}
-
-table {
-	display: table;
-	width: 100%;
-	text-align: center;
-}
-
-.custom-container-title {
-	display: none;
-}
\ No newline at end of file
diff --git a/docs/.vuepress/styles/palette.scss b/docs/.vuepress/styles/palette.scss
deleted file mode 100644
index ed460fc..0000000
--- a/docs/.vuepress/styles/palette.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-:root {
-    --c-brand: #30bcd5;
-    --c-tip: #30bcd5;
-
-    --c-bg: #f6f6f6;
-    --c-bg-light: #f0f0f0;
-}
-
-html.dark {
-    --c-brand: #30bcd5;
-
-    --c-tip: #3992a3;
-    --c-warning: #ceab00;
-    --c-warning-bg: var(--c-tip-bg);
-    --c-warning-title: #ceac03;
-    --c-warning-text: var(--c-text);
-    --c-warning-text-accent: #dbca79;
-    --c-danger: #97424a;
-    --c-danger-bg: var(--c-tip-bg);
-    --c-danger-title: #610000;
-    --c-danger-text: var(--c-text);
-    --c-danger-text-accent: #e96e6e;
-    --c-details-bg: #323843;
-}
\ No newline at end of file
diff --git a/docs/.vuepress/templates/index.dev.html b/docs/.vuepress/templates/index.dev.html
deleted file mode 100644
index 31be038..0000000
--- a/docs/.vuepress/templates/index.dev.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width,initial-scale=1">
-	<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
-	<style>
-		:root {
-			--c-bg: #fff;
-		}
-
-		html.dark {
-			--c-bg: #22272e;
-		}
-
-		html, body {
-			background-color: var(--c-bg);
-		}
-	</style>
-	<script>
-		(function() {
-			const userMode = localStorage.getItem('vuepress-color-scheme');
-			const systemDarkMode = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
-
-			if (userMode === 'dark' || (userMode !== 'light' && systemDarkMode)) {
-				document.documentElement.classList.toggle('dark', true);
-			}
-		})();
-	</script>
-	<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
-	<script>
-		window.googletag = window.googletag || {cmd: []};
-		googletag.cmd.push(function() {
-		  googletag.defineSlot('/22046652915/ios-0', [[320, 50], [728, 90]], 'div-gpt-ad-1651588117904-0').addService(googletag.pubads());
-		  googletag.pubads().enableSingleRequest();
-		  googletag.enableServices();
-		});
-	</script>
-	<script>
-	  window.googletag = window.googletag || {cmd: []};
-	  googletag.cmd.push(function() {
-		googletag.defineSlot('/22046652915/ios-1', [[728, 90], [320, 50]], 'div-gpt-ad-1651588394718-0').addService(googletag.pubads());
-		googletag.pubads().enableSingleRequest();
-		googletag.enableServices();
-	  });
-	</script>
-</head>
-<body>
-	<div id="app"></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/.vuepress/templates/index.ssr.html b/docs/.vuepress/templates/index.ssr.html
deleted file mode 100644
index 03893a5..0000000
--- a/docs/.vuepress/templates/index.ssr.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ lang }}">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width,initial-scale=1">
-	<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
-	<style>
-		:root {
-			--c-bg: #fff;
-		}
-
-		html.dark {
-			--c-bg: #22272e;
-		}
-
-		html, body {
-			background-color: var(--c-bg);
-		}
-	</style>
-	<script>
-		(function() {
-			const userMode = localStorage.getItem('vuepress-color-scheme');
-			const systemDarkMode = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
-
-			if (userMode === 'dark' || (userMode !== 'light' && systemDarkMode)) {
-				document.documentElement.classList.toggle('dark', true);
-			}
-		})();
-	</script>
-<!--vuepress-ssr-head-->
-<!--vuepress-ssr-resources-->
-<!--vuepress-ssr-styles-->
-</head>
-<body>
-	<div id="app"><!--vuepress-ssr-app--></div>
-	<!--vuepress-ssr-scripts-->
-</body>
-</html>
\ No newline at end of file
diff --git a/emiyl-theme b/emiyl-theme
deleted file mode 160000
index 067cefe..0000000
--- a/emiyl-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 067cefea81b625421ac44098c1ddbde8301fed18
diff --git a/emiyl-theme-2 b/emiyl-theme-2
new file mode 160000
index 0000000..a7e08b0
--- /dev/null
+++ b/emiyl-theme-2
@@ -0,0 +1 @@
+Subproject commit a7e08b033d59262749c9d6e90cdfb32e699d3fa8
diff --git a/package.json b/package.json
index a293c62..fc099fd 100644
--- a/package.json
+++ b/package.json
@@ -6,11 +6,8 @@
     "author": "emiyl <me@emiyl.com>",
     "license": "MIT",
     "devDependencies": {
-        "@vuepress/plugin-register-components": "2.0.0-beta.49",
-        "@vuepress/plugin-search": "2.0.0-beta.49",
-        "markdown-it-container": "^3.0.0",
-        "markdown-it-include": "^2.0.0",
-        "vuepress": "2.0.0-beta.49"
+        "@vuepress/plugin-register-components": "2.0.0-rc.0",
+        "vuepress": "2.0.0-rc.0"
     },
     "scripts": {
         "dev": "vuepress dev docs",