diff --git a/src/lib/features/database/weapons/sections/WeaponStatsSection.svelte b/src/lib/features/database/weapons/sections/WeaponStatsSection.svelte
index 509e7cf0..6270fd1e 100644
--- a/src/lib/features/database/weapons/sections/WeaponStatsSection.svelte
+++ b/src/lib/features/database/weapons/sections/WeaponStatsSection.svelte
@@ -1,39 +1,143 @@
- {#if editMode}
-
-
-
- {:else}
-
-
- {#if flb}
-
- {/if}
- {/if}
+ {#if editMode}
+
+
+ {#if flb}
+
+ {/if}
+ {#if ulb}
+
+ {/if}
+ {:else}
+
+
+ {#if flb}
+
+ {/if}
+ {#if ulb}
+
+ {/if}
+ {/if}
- {#if editMode}
-
-
-
- {:else}
-
-
- {#if flb}
-
- {/if}
- {/if}
+ {#if editMode}
+
+
+ {#if flb}
+
+ {/if}
+ {#if ulb}
+
+ {/if}
+ {:else}
+
+
+ {#if flb}
+
+ {/if}
+ {#if ulb}
+
+ {/if}
+ {/if}
+
+
+
+ {#if editMode}
+
+
+
+ {:else}
+
+ {#if weapon.maxSkillLevel}
+
+ {/if}
+ {#if weapon.maxAwakeningLevel}
+
+ {/if}
+ {/if}
diff --git a/src/lib/features/database/weapons/sections/WeaponTaxonomySection.svelte b/src/lib/features/database/weapons/sections/WeaponTaxonomySection.svelte
index 48f5eac2..635fa74e 100644
--- a/src/lib/features/database/weapons/sections/WeaponTaxonomySection.svelte
+++ b/src/lib/features/database/weapons/sections/WeaponTaxonomySection.svelte
@@ -1,29 +1,75 @@
- {#if editMode}
-
-
-
- {:else}
-
-
- {#if Array.isArray(weapon.proficiency) && weapon.proficiency[1] !== undefined}
-
- {/if}
- {/if}
+ {#if editMode}
+
+
+
+
+ {:else}
+
+
+ {#if weapon.series}
+ {@const seriesLabel = getWeaponSeriesSlug(weapon.series)}
+ w.charAt(0).toUpperCase() + w.slice(1))
+ .join(' ')
+ : String(weapon.series)}
+ />
+ {/if}
+ {/if}
-
diff --git a/src/lib/features/database/weapons/sections/WeaponUncapSection.svelte b/src/lib/features/database/weapons/sections/WeaponUncapSection.svelte
index c70a1e70..b882b139 100644
--- a/src/lib/features/database/weapons/sections/WeaponUncapSection.svelte
+++ b/src/lib/features/database/weapons/sections/WeaponUncapSection.svelte
@@ -1,27 +1,131 @@
-
-
-
+ {#if weapon?.uncap || editMode}
+
+
+
+ {/if}
- {#if editMode}
-
-
-
- {/if}
+ {#if editMode}
+
+
+
+
+
+
+ {/if}
-
diff --git a/src/routes/(app)/database/weapons/new/+page.svelte b/src/routes/(app)/database/weapons/new/+page.svelte
new file mode 100644
index 00000000..1b945126
--- /dev/null
+++ b/src/routes/(app)/database/weapons/new/+page.svelte
@@ -0,0 +1,389 @@
+
+
+
+
+
+
+ {#snippet leftAccessory()}
+
+ {/snippet}
+ {#snippet rightAccessory()}
+
+ {/snippet}
+
+
+ {#if saveError}
+
{saveError}
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {#if editData.flb}
+
+ {/if}
+ {#if editData.ulb}
+
+ {/if}
+ {#if editData.transcendence}
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+