diff --git a/README.md b/README.md
index 4f0101b..2663b4c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# EisHub-Catalogue-Entry
-Simple interface for submitting catalogue entries to the EisHub Scribes
+# Eisvana-Catalogue-Entry
+Simple interface for submitting catalogue entries to the Eisvana Wiki Scholars
diff --git a/index.html b/index.html
index 5267f42..a1f9884 100644
--- a/index.html
+++ b/index.html
@@ -4,12 +4,12 @@
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>EisHub Catalogue Entry</title>
+  <script type="module" src="/src/main.ts"></script>
+  <title>Eisvana Catalogue Entry</title>
 </head>
 
 <body>
   <div id="app" class="container"></div>
-  <script type="module" src="/src/main.ts"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index b692cc3..de21dd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "eishub-catalogue-entry",
+  "name": "eisvana-catalogue-entry",
   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "eishub-catalogue-entry",
+      "name": "eisvana-catalogue-entry",
       "version": "0.0.0",
       "dependencies": {
         "@picocss/pico": "^1.5.10",
diff --git a/package.json b/package.json
index 6fd458d..5d284ef 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "eishub-catalogue-entry",
+  "name": "eisvana-catalogue-entry",
   "version": "0.0.0",
   "private": true,
   "scripts": {
diff --git a/src/App.vue b/src/App.vue
index abda0f1..db72f33 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,7 @@ import { storeToRefs } from 'pinia';
 import router from './router';
 
 const catalogueDataStore = useCatalogueDataStore();
-const { file, name } = storeToRefs(catalogueDataStore);
+const { file, name, isArtifact } = storeToRefs(catalogueDataStore);
 
 const persistentDataStore = usePersistentDataStore();
 const { requiredFields, catalogueUrl } = storeToRefs(persistentDataStore);
@@ -17,6 +17,7 @@ router.afterEach((to) => {
   catalogueUrl.value = typeof newCatalogueUrl === 'string' ? newCatalogueUrl : '';
   requiredFields.value = Array.isArray(newRequiredFields) ? newRequiredFields : [];
 
+  isArtifact.value = to.name === 'Artifact';
   name.value.value = '';
   file.value.value = null;
 });
@@ -25,7 +26,7 @@ router.afterEach((to) => {
 <template>
   <header>
     <NavBar />
-    <h1 class="title">EisHub Catalogue Entry</h1>
+    <h1 class="title">Eisvana Catalogue Entry</h1>
   </header>
 
   <main>
diff --git a/src/components/ActionButtons.vue b/src/components/ActionButtons.vue
index d3e532d..2258172 100644
--- a/src/components/ActionButtons.vue
+++ b/src/components/ActionButtons.vue
@@ -24,6 +24,7 @@ const {
   sandworm,
   flora,
   planet,
+  artifact,
 } = storeToRefs(catalogueDataStore);
 const persistentDataStore = usePersistentDataStore();
 const { contact, submittedEntries, catalogueUrl } = storeToRefs(persistentDataStore);
@@ -52,6 +53,7 @@ const albumStrings: { [key: string]: string } = reactive({
   sandworm,
   flora,
   planet,
+  artifact,
 });
 
 const isValidData = computed(() => useRequiredFields().isValidData);
diff --git a/src/components/DiscovererInputs.vue b/src/components/DiscovererInputs.vue
index 6015258..755cd22 100644
--- a/src/components/DiscovererInputs.vue
+++ b/src/components/DiscovererInputs.vue
@@ -1,32 +1,47 @@
 <script setup lang="ts">
+import { watchEffect } from 'vue';
 import { useCatalogueDataStore } from '../stores/catalogueData';
 import { usePersistentDataStore } from '../stores/persistentData';
 import { storeToRefs } from 'pinia';
 
 const catalogueDataStore = useCatalogueDataStore();
-const { discoverer, discovererReddit, notes } = storeToRefs(catalogueDataStore);
+const { discoverer, discovererReddit, notes, isArtifact } = storeToRefs(catalogueDataStore);
 const persistentDataStore = usePersistentDataStore();
 const { contact } = storeToRefs(persistentDataStore);
+
+watchEffect(() => {
+  discoverer.value.isActive = !isArtifact.value;
+  discovererReddit.value.isActive = !isArtifact.value;
+});
 </script>
 
 <template>
   <div class="input-group">
-    <div>
-      <label for="username">Discoverer</label>
-      <input
-        type="text"
-        id="username"
-        v-model="discoverer.value"
-      />
-    </div>
+    <div
+      v-if="!isArtifact"
+      class="discoverer-group-wrapper"
+    >
+      <p class="required one-required-notice">Fill out at least one</p>
+      <div class="discoverer-group">
+        <div>
+          <label for="username">Discoverer</label>
+          <input
+            class="required"
+            type="text"
+            id="username"
+            v-model="discoverer.value"
+          />
+        </div>
 
-    <div>
-      <label for="redditUsername">Discoverer Reddit Name (if available)</label>
-      <input
-        type="text"
-        id="redditUsername"
-        v-model="discovererReddit.value"
-      />
+        <div>
+          <label for="redditUsername">Discoverer Reddit Name (if available)</label>
+          <input
+            type="text"
+            id="redditUsername"
+            v-model="discovererReddit.value"
+          />
+        </div>
+      </div>
     </div>
 
     <div>
@@ -42,8 +57,8 @@ const { contact } = storeToRefs(persistentDataStore);
       />
     </div>
 
-    <div>
-      <label for="notes">Additional Notes for the Scribe Team</label>
+    <div class="textarea-wrapper">
+      <label for="notes">Additional Notes for the Wiki Scholar Team</label>
       <textarea
         class="textarea"
         id="notes"
@@ -55,7 +70,36 @@ const { contact } = storeToRefs(persistentDataStore);
 </template>
 
 <style scoped lang="scss">
-.textarea {
-  resize: vertical;
+.textarea-wrapper {
+  width: 100%;
+  .textarea {
+    resize: vertical;
+  }
+}
+
+.discoverer-group-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: column;
+  padding: 0.5rem;
+  border: 1px solid var(--form-element-border-color);
+  border-radius: var(--border-radius);
+
+  .one-required-notice {
+    margin: 0;
+    font-size: 0.75rem;
+    text-align: center;
+  }
+
+  .discoverer-group {
+    display: flex;
+    flex-wrap: wrap;
+    flex-grow: 1;
+    gap: 1rem;
+
+    & > * {
+      flex-grow: 1;
+    }
+  }
 }
 </style>
diff --git a/src/components/GlyphInput.vue b/src/components/GlyphInput.vue
index 7b56581..02ba998 100644
--- a/src/components/GlyphInput.vue
+++ b/src/components/GlyphInput.vue
@@ -61,7 +61,7 @@ watchEffect(() => (glyphs.value.isValid = isValidGlyphs.value));
     <ErrorMessage
       v-if="glyphs.value.length === 12 && !isValidGlyphs"
       class="error"
-      >Glyphs are outside of EisHub space!</ErrorMessage
+      >Glyphs are outside of Eisvana space!</ErrorMessage
     >
     <div class="portal-buttons grid">
       <button
diff --git a/src/components/NavLink.vue b/src/components/NavLink.vue
index 1e84d62..a91c213 100644
--- a/src/components/NavLink.vue
+++ b/src/components/NavLink.vue
@@ -16,6 +16,9 @@ defineProps<{
 
 <style scoped lang="scss">
 .link {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   font-size: inherit;
   padding: 0.75rem 1.25rem;
   width: 100%;
diff --git a/src/composables/useRequiredFields.ts b/src/composables/useRequiredFields.ts
index ef8d4cf..8b008de 100644
--- a/src/composables/useRequiredFields.ts
+++ b/src/composables/useRequiredFields.ts
@@ -1,7 +1,7 @@
-import { reactive } from "vue";
+import { reactive } from 'vue';
 import { useCatalogueDataStore } from '../stores/catalogueData';
 import { usePersistentDataStore } from '../stores/persistentData';
-import { storeToRefs } from "pinia";
+import { storeToRefs } from 'pinia';
 
 export function useRequiredFields() {
   const catalogueDataStore = useCatalogueDataStore();
@@ -25,6 +25,12 @@ export function useRequiredFields() {
     mtType,
     shipType,
     isValidDiscoverer,
+    artifactType,
+    artifactRarity,
+    modifier,
+    value,
+    id,
+    isValidGlyphs,
   } = storeToRefs(catalogueDataStore);
 
   const persistentDataStore = usePersistentDataStore();
@@ -32,8 +38,8 @@ export function useRequiredFields() {
 
   const fields: {
     [key: string]: {
-      [key: string]: string | File | null | boolean
-    }
+      [key: string]: string | File | null | boolean;
+    };
   } = reactive({
     name,
     file,
@@ -54,11 +60,21 @@ export function useRequiredFields() {
     mtType,
     shipType,
     contact,
+    artifactType,
+    artifactRarity,
+    modifier,
+    value,
+    id,
   });
 
   const standardFields: string[] = ['contact', 'name', 'file', ...requiredFields.value];
 
-  const isValidData = standardFields.filter((field) => fields[field].isActive).every(field => fields[field].value && fields[field].isValid !== false) && isValidDiscoverer.value;
+  const isValidData =
+    standardFields
+      .filter((field) => fields[field].isActive)
+      .every((field) => fields[field].value && fields[field].isValid !== false) &&
+    isValidDiscoverer.value &&
+    isValidGlyphs.value;
 
   return { isValidData };
-}
\ No newline at end of file
+}
diff --git a/src/css/style.scss b/src/css/style.scss
index 66eac81..66b4cb1 100644
--- a/src/css/style.scss
+++ b/src/css/style.scss
@@ -9,7 +9,7 @@
 
 .container {
   margin-block-start: 1rem;
-  margin-block-end: 5rem;
+  margin-block-end: 2rem;
 }
 
 html,
diff --git a/src/objects/regions.ts b/src/objects/regions.ts
new file mode 100644
index 0000000..1a112fa
--- /dev/null
+++ b/src/objects/regions.ts
@@ -0,0 +1 @@
+export const regions = ['A21117FF', 'A11117FF', 'A11127FF', 'A21127FF', 'A21107FF', 'A21107FE', 'A21117FE'];
diff --git a/src/pages/Artifact.vue b/src/pages/Artifact.vue
new file mode 100644
index 0000000..05c90b7
--- /dev/null
+++ b/src/pages/Artifact.vue
@@ -0,0 +1,81 @@
+<script setup lang="ts">
+import { useCatalogueDataStore } from '../stores/catalogueData';
+import { storeToRefs } from 'pinia';
+import ErrorMessage from '../components/ErrorMessage.vue';
+import { watchEffect } from 'vue';
+
+const catalogueDataStore = useCatalogueDataStore();
+const { artifactType, artifactRarity, modifier, value, id, isValidValue, isValidModifier, isValidId } =
+  storeToRefs(catalogueDataStore);
+
+watchEffect(() => {
+  modifier.value.isValid = isValidModifier.value;
+  value.value.isValid = isValidValue.value;
+  id.value.isValid = isValidId.value;
+});
+</script>
+
+<template>
+  <div class="input-group">
+    <div>
+      <label class="required">Type</label>
+      <select v-model="artifactType.value">
+        <option value="Ancient Skeleton">Ancient Skeleton</option>
+        <option value="Aquatic Treasure">Aquatic Treasure</option>
+        <option value="Biological Sample">Biological Sample</option>
+        <option value="Delicate Flora (FARM)">Delicate Flora (mutated genes)</option>
+        <option value="Delicate Flora (PLNT)">Delicate Flora (years)</option>
+        <option value="Excavated Bones">Excavated Bones</option>
+        <option value="Fossil Sample">Fossil Sample</option>
+        <option value="Historical Document">Historical Document</option>
+        <option value="Lost Artifact">Lost Artifact</option>
+        <option value="Salvaged Scrap">Salvaged Scrap</option>
+        <option value="Terrifying Sample">Terrifying Sample</option>
+        <option value="Unearthed Treasure">Unearthed Treasure</option>
+      </select>
+    </div>
+    <div>
+      <label class="required">Rarity</label>
+      <select v-model="artifactRarity.value">
+        <option value="Common">Common (Blue)</option>
+        <option value="Uncommon">Uncommon (Purple) Treasure</option>
+        <option value="Rare">Rare (Yellow)</option>
+      </select>
+    </div>
+    <div>
+      <label
+        class="required"
+        for="modifier"
+        >Modifier</label
+      >
+      <input
+        v-model="modifier.value"
+        id="modifier"
+        type="text"
+      />
+      <ErrorMessage v-if="!isValidModifier">Must only contain numbers</ErrorMessage>
+    </div>
+    <div>
+      <label
+        class="required"
+        for="value"
+        >Value</label
+      >
+      <input
+        v-model="value.value"
+        id="value"
+        type="text"
+      />
+      <ErrorMessage v-if="!isValidValue">Must only contain numbers</ErrorMessage>
+    </div>
+    <div>
+      <label for="id">ID (from save editor)</label>
+      <input
+        v-model="id.value"
+        id="id"
+        type="text"
+      />
+      <ErrorMessage v-if="!isValidId">Must only contain numbers</ErrorMessage>
+    </div>
+  </div>
+</template>
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 507dadc..83e2349 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import NavLink from '../components/NavLink.vue';
-import Logo from '../components/Logo.vue';
+// import Logo from '../components/Logo.vue';
 </script>
 
 <template>
@@ -40,19 +40,23 @@ import Logo from '../components/Logo.vue';
         route="/planet"
         title="Planet"
       />
+      <NavLink
+        route="/artifact"
+        title="Artifact"
+      />
     </nav>
 
     <p>
-      A service of the
-      <a
+      A service of the Eisvana Wiki Scholars
+      <!-- <a
         href="https://nomanssky.fandom.com/wiki/Galactic_Hub_Eissentam_Scribes"
         rel="noopener noreferrer"
         target="_blank"
         >Galactic Hub Eissentam Scribes</a
-      >
+      > -->
     </p>
 
-    <div class="logos">
+    <!-- <div class="logos">
       <Logo
         alt="Galactic Hub Eissentam logo"
         href="https://nomanssky.fandom.com/wiki/Galactic_Hub_Eissentam"
@@ -63,7 +67,7 @@ import Logo from '../components/Logo.vue';
         href="https://nomanssky.fandom.com/wiki/Galactic_Hub_Eissentam_Scribes"
         src="https://static.wikia.nocookie.net/nomanssky_gamepedia/images/e/ea/EisHub_Scribe_logo.png"
       />
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -81,9 +85,9 @@ import Logo from '../components/Logo.vue';
 
 .link-grid {
   display: grid;
-  grid-template-columns: repeat(2, 1fr);
+  grid-template-columns: repeat(auto-fill,minmax(200px,1fr));
   gap: 2rem;
-  width: min(100%, 600px);
+  max-width: 900px;
   font-size: 1.5rem;
   margin-inline: auto;
   margin-block: 3rem;
diff --git a/src/router/index.ts b/src/router/index.ts
index b28af03..0508379 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router';
 import ErrorNotFound from '../views/404.vue';
 import Home from '../views/Home.vue';
 import Form from '../views/Form.vue';
@@ -13,9 +13,9 @@ const router = createRouter({
         {
           path: '',
           name: 'Home',
-          component: () => import('../pages/Home.vue')
-        }
-      ]
+          component: () => import('../pages/Home.vue'),
+        },
+      ],
     },
     {
       path: '/starship',
@@ -27,10 +27,10 @@ const router = createRouter({
           component: () => import('../pages/Starship.vue'),
           meta: {
             requiredFields: ['economy', 'coordinates', 'tier', 'locationName', 'shipType'],
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Starship_Catalogs',
-          }
-        }
-      ]
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana_Starship_Catalogues',
+          },
+        },
+      ],
     },
     {
       path: '/freighter',
@@ -42,10 +42,10 @@ const router = createRouter({
           component: () => import('../pages/Freighter.vue'),
           meta: {
             requiredFields: ['economy', 'systemFaction'],
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Freighter_Catalog',
-          }
-        }
-      ]
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana_Freighter_Catalogue',
+          },
+        },
+      ],
     },
     {
       path: '/frigate',
@@ -57,10 +57,10 @@ const router = createRouter({
           component: () => import('../pages/Frigate.vue'),
           meta: {
             requiredFields: ['tier'],
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Organic_Frigate_Catalog',
-          }
-        }
-      ]
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana_Organic_Frigate_Catalogue',
+          },
+        },
+      ],
     },
     {
       path: '/multitool',
@@ -71,11 +71,21 @@ const router = createRouter({
           name: 'Multi-Tool',
           component: () => import('../pages/Multitool.vue'),
           meta: {
-            requiredFields: ['coordinates', 'tier', 'slots', 'saveReloadLocationName', 'saveReloadLocationType', 'locationType', 'locationName', 'subtype', 'mtType'],
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Multi-Tool_Catalogs',
-          }
-        }
-      ]
+            requiredFields: [
+              'coordinates',
+              'tier',
+              'slots',
+              'saveReloadLocationName',
+              'saveReloadLocationType',
+              'locationType',
+              'locationName',
+              'subtype',
+              'mtType',
+            ],
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana_Multi-Tool_Catalogues',
+          },
+        },
+      ],
     },
     {
       path: '/creature',
@@ -87,10 +97,10 @@ const router = createRouter({
           component: () => import('../pages/Creature.vue'),
           meta: {
             requiredFields: ['size'],
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Fauna_Albums',
-          }
-        }
-      ]
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana#Fauna_&_Flora',
+          },
+        },
+      ],
     },
     {
       path: '/sandworm',
@@ -102,10 +112,10 @@ const router = createRouter({
           component: () => import('../pages/Sandworm.vue'),
           meta: {
             requiredFields: ['depth', 'stomach'],
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Shaihuluda_Album',
-          }
-        }
-      ]
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana_Rare_Fauna_Album',
+          },
+        },
+      ],
     },
     {
       path: '/flora',
@@ -116,10 +126,10 @@ const router = createRouter({
           name: 'Flora',
           component: () => import('../pages/Flora.vue'),
           meta: {
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Flora_Albums',
-          }
-        }
-      ]
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana_Flora_Albums',
+          },
+        },
+      ],
     },
     {
       path: '/planet',
@@ -130,16 +140,31 @@ const router = createRouter({
           name: 'Planet',
           component: () => import('../pages/Planet.vue'),
           meta: {
-            catalogueUrl: 'https://nomanssky.fandom.com/wiki/EisHub_Planet_Albums',
-          }
-        }
-      ]
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Eisvana_Planet_Albums',
+          },
+        },
+      ],
+    },
+    {
+      path: '/artifact',
+      component: Form,
+      children: [
+        {
+          path: '',
+          name: 'Artifact',
+          component: () => import('../pages/Artifact.vue'),
+          meta: {
+            requiredFields: ['artifactType', 'artifactRarity', 'modifier', 'value'],
+            catalogueUrl: 'https://nomanssky.fandom.com/wiki/Special:Upload',
+          },
+        },
+      ],
     },
     {
       path: '/:catchAll(.*)*',
-      component: ErrorNotFound
-    }
-  ]
-})
+      component: ErrorNotFound,
+    },
+  ],
+});
 
-export default router
+export default router;
diff --git a/src/stores/catalogueData.ts b/src/stores/catalogueData.ts
index 0f755f9..fd20826 100644
--- a/src/stores/catalogueData.ts
+++ b/src/stores/catalogueData.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia';
 import type { StellarLocation, MTSubtype, MTType, ShipType, Tiers, FormItem } from '../types/catalogue';
 import { albumEntry, discovererParm, addInfoMt, starshipOther, checkNumberString } from '../functions/functions';
+import { regions } from '../objects/regions';
 
 interface State {
   name: FormItem<string>;
@@ -13,7 +14,7 @@ interface State {
   coordinates: FormItem<string>;
   size: FormItem<string>;
   tier: FormItem<Tiers>;
-  systemFaction: FormItem<'Korvax' | 'Vy\'keen' | 'Gek'>;
+  systemFaction: FormItem<'Korvax' | "Vy'keen" | 'Gek'>;
   saveReloadLocationName: FormItem<string>;
   locationName: FormItem<string>;
   saveReloadLocationType: FormItem<StellarLocation>;
@@ -27,10 +28,31 @@ interface State {
   mtType: FormItem<MTType>;
   shipType: FormItem<ShipType>;
   isCrashed: FormItem<boolean>;
+  artifactType: FormItem<
+    | 'Ancient Skeleton'
+    | 'Aquatic Treasure'
+    | 'Biological Sample'
+    | 'Delicate Flora (FARM)'
+    | 'Delicate Flora (PLNT)'
+    | 'Excavated Bones'
+    | 'Fossil Sample'
+    | 'Historical Document'
+    | 'Lost Artifact'
+    | 'Salvaged Scrap'
+    | 'Terrifying Sample'
+    | 'Unearthed Treasure'
+  >;
+  artifactRarity: FormItem<'Common' | 'Uncommon' | 'Rare'>;
+  modifier: FormItem<string>;
+  value: FormItem<string>;
+  id: FormItem<string>;
+  version: 'Echoes';
+  isArtifact: boolean;
 }
 
 export const useCatalogueDataStore = defineStore('catalogueData', {
   state: (): State => ({
+    version: 'Echoes',
     name: {
       isActive: true,
       value: '',
@@ -129,23 +151,136 @@ export const useCatalogueDataStore = defineStore('catalogueData', {
       isActive: true,
       value: false,
     },
+    artifactType: {
+      isActive: true,
+      value: 'Ancient Skeleton',
+    },
+    artifactRarity: {
+      isActive: true,
+      value: 'Common',
+    },
+    modifier: {
+      isActive: true,
+      isValid: false,
+      value: '',
+    },
+    value: {
+      isActive: true,
+      isValid: false,
+      value: '',
+    },
+    id: {
+      isActive: true,
+      isValid: false,
+      value: '',
+    },
+    isArtifact: false,
   }),
 
   getters: {
-    isValidGlyphs: (state) => /(?:[0-9A-F]{4})F(?:[89A])55(?:[5-7])C(?:[23])(?:[01F])/.test(state.glyphs.value), // tests if an address is valid for EisHub
-    isValidDiscoverer: (state) => (Boolean(state.discoverer.value || state.discovererReddit.value)),
-    isValidCoords: (state) => (/^[+-](?:[0-9]{1,3})\.(?:[0-9]{2}), [+-](?:[0-9]{1,3})\.(?:[0-9]{2})$/.test(state.coordinates.value) || !state.coordinates.value),
-    isValidDepth: (state) => (checkNumberString(state.depth.value)),
-    isValidSize: (state) => (checkNumberString(state.size.value)),
-    isValidSlots: (state) => (checkNumberString(state.slots.value)),
+    isValidGlyphs: (state) => state.isArtifact || regions.includes(state.glyphs.value.substring(4)), // NoSonar region glyphs start at index 4. Tests if an address is valid for Eisvana
+    isValidDiscoverer: (state) =>
+      Boolean(state.isArtifact || (state.discoverer.value || state.discovererReddit.value)),
+    isValidCoords: (state) =>
+      /^[+-](?:[0-9]{1,3})\.(?:[0-9]{2}), [+-](?:[0-9]{1,3})\.(?:[0-9]{2})$/.test(state.coordinates.value) ||
+      !state.coordinates.value,
+    isValidDepth: (state) => checkNumberString(state.depth.value),
+    isValidSize: (state) => checkNumberString(state.size.value),
+    isValidSlots: (state) => checkNumberString(state.slots.value),
+    isValidValue: (state) => checkNumberString(state.value.value),
+    isValidModifier: (state) => checkNumberString(state.modifier.value),
+    isValidId: (state) => checkNumberString(state.id.value),
 
-    starship: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, starshipOther(state.shipType.value, state.coordinates.value, state.locationName.value, state.economy.value, state.isCrashed.value, state.tier.value), state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value)),
-    freighter: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, `<br>${state.economy.value} - ${state.systemFaction.value}`, state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value)),
-    frigate: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, state.tier.value, state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value)),
-    multitool: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, `<br>{{class|${state.tier.value}}} - ${(['Experimental', 'Standard', 'Alien']).includes(state.mtType.value) ? state.subtype.value + ' - ' : ''}${state.slots.value} Slots`, state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value), addInfoMt(state.coordinates.value, state.saveReloadLocationName.value, state.locationName.value, state.saveReloadLocationType.value, state.locationType.value)),
-    creature: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, `(${state.size.value}m)`, state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value)),
-    sandworm: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, `(${state.depth.value}ku)<br>Stomach: ${state.stomach.value}`, state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value)),
-    flora: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, undefined, state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value)),
-    planet: (state) => albumEntry(state.compressedFile?.name ?? '', state.name.value, state.features.value, state.glyphs.value, discovererParm(state.discovererReddit.value, state.discoverer.value)),
-  }
+    starship: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        starshipOther(
+          state.shipType.value,
+          state.coordinates.value,
+          state.locationName.value,
+          state.economy.value,
+          state.isCrashed.value,
+          state.tier.value
+        ),
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value)
+      ),
+    freighter: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        `<br>${state.economy.value} - ${state.systemFaction.value}`,
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value)
+      ),
+    frigate: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        state.tier.value,
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value)
+      ),
+    multitool: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        `<br>{{class|${state.tier.value}}} - ${
+          ['Experimental', 'Standard', 'Alien'].includes(state.mtType.value) ? state.subtype.value + ' - ' : ''
+        }${state.slots.value} Slots`,
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value),
+        addInfoMt(
+          state.coordinates.value,
+          state.saveReloadLocationName.value,
+          state.locationName.value,
+          state.saveReloadLocationType.value,
+          state.locationType.value
+        )
+      ),
+    creature: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        `(${state.size.value}m)`,
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value)
+      ),
+    sandworm: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        `(${state.depth.value}ku)<br>Stomach: ${state.stomach.value}`,
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value)
+      ),
+    flora: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        undefined,
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value)
+      ),
+    planet: (state) =>
+      albumEntry(
+        state.compressedFile?.name ?? '',
+        state.name.value,
+        state.features.value,
+        state.glyphs.value,
+        discovererParm(state.discovererReddit.value, state.discoverer.value)
+      ),
+    artifact: (state) =>
+      `{{Artifact
+        | name = ${state.name.value}
+        | image =
+        | type = ${state.artifactType.value}
+        | rarity = ${state.artifactRarity.value}
+        | modifier = ${state.modifier.value}
+        | value = ${state.value.value}
+        | id = ${state.id.value}
+        | release = ${state.version}
+        }}`,
+  },
 });
diff --git a/src/views/Form.vue b/src/views/Form.vue
index a01c8c2..72886f3 100644
--- a/src/views/Form.vue
+++ b/src/views/Form.vue
@@ -3,10 +3,17 @@ import GlyphInput from '../components/GlyphInput.vue';
 import ActionButtons from '../components/ActionButtons.vue';
 import DefaultInputs from '../components/DefaultInputs.vue';
 import DiscovererInputs from '../components/DiscovererInputs.vue';
-import { ref } from 'vue';
+import { ref, watchEffect } from 'vue';
 import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useCatalogueDataStore } from '@/stores/catalogueData';
 
 const form = ref<HTMLFormElement | null>(null);
+
+const catalogueDataStore = useCatalogueDataStore();
+const { isArtifact, glyphs } = storeToRefs(catalogueDataStore);
+
+watchEffect(() => (glyphs.value.isActive = !isArtifact));
 </script>
 
 <template>
@@ -17,7 +24,7 @@ const form = ref<HTMLFormElement | null>(null);
     @submit.prevent
   >
     <DefaultInputs />
-    <GlyphInput />
+    <GlyphInput v-if="!isArtifact" />
 
     <router-view />
 
diff --git a/tsconfig.app.json b/tsconfig.app.json
index bf15ea6..31ed6c6 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -18,7 +18,6 @@
     "noImplicitReturns": true,
     "skipLibCheck": true,
     "composite": true,
-    "baseUrl": "/EisHub-Catalogue-Entry/",
     "paths": {
       "@/*": ["./src/*"]
     }
diff --git a/vite.config.ts b/vite.config.ts
index 88d3e0a..6954a45 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,7 +5,7 @@ import vue from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-	base: '/EisHub-Catalogue-Entry/',
+	base: '/Eisvana-Catalogue-Entry/',
 	plugins: [
 		vue(),
 	],
