diff --git a/src/autoTag.js b/src/autoTag.js
index 038faa6..dc22ad8 100644
--- a/src/autoTag.js
+++ b/src/autoTag.js
@@ -1,15 +1,19 @@
-const basicIncludes = (bundleCode, code, display = (code[0].toUpperCase() + code.substring(1))) => {
+const basicIncludes = (bundleCode, code, display = code[0].toUpperCase() + code.substring(1)) => {
   if (bundleCode.includes(code)) return display;
 };
 
-export default (bundleCode) => { // Scans final bundle JS to try and auto-detect things, then adding tags
+export default (bundleCode, currentTags) => {
+  // Scans final bundle JS to try and auto-detect things, then adding tags
   const tags = [
     basicIncludes(bundleCode, 'react'),
     basicIncludes(bundleCode, 'document', 'DOM'),
 
-    (bundleCode.includes('document.createTextNode') && /document\.createElement\(['"`]style['"`]\)/.test(bundleCode)) ? 'CSS' : undefined,
+    /document\.createElement\(['"`]style['"`]\)/.test(bundleCode) ? 'CSS' : undefined,
 
-  ].filter((x) => x !== undefined);
+    currentTags.includes('themes') ? 'theme' : undefined,
+  ]
+    .filter((x) => x !== undefined)
+    .concat(currentTags.filter((x) => x !== 'themes'));
 
   return tags;
-};
\ No newline at end of file
+};
diff --git a/src/siteGen/index.js b/src/siteGen/index.js
index 9160e34..854cde5 100644
--- a/src/siteGen/index.js
+++ b/src/siteGen/index.js
@@ -79,7 +79,7 @@ export default () => {
   let cards = [];
   let metas = [];
 
-  let name = 'GooseMod Store';
+  let name = 'NovaGM Store';
   let description = '';
 
   for (const repo of repos) {