diff --git a/module/sheets/Items/UntypedItemSheet.mjs b/module/sheets/Items/UntypedItemSheet.mjs
index 83dd96b..2c184e6 100644
--- a/module/sheets/Items/UntypedItemSheet.mjs
+++ b/module/sheets/Items/UntypedItemSheet.mjs
@@ -48,10 +48,9 @@ export class UntypedItemSheet extends GenericItemSheet {
 	async getData() {
 		const ctx = await super.getData();
 
-		ctx.computed = {
-			showSettingsTab: ctx.isGM || this.item.isOwned,
-			isEmbedded: this.item.isOwned,
-		};
+		ctx.meta.showSettingsTab = ctx.isGM || this.item.isOwned;
+		ctx.meta.isEmbedded = this.item.isOwned;
+		ctx.meta.isEditable = this.isEditable;
 
 		return ctx;
 	};
diff --git a/styles/v3/elements/button.scss b/styles/v3/elements/button.scss
index f34c955..b758bee 100644
--- a/styles/v3/elements/button.scss
+++ b/styles/v3/elements/button.scss
@@ -15,7 +15,7 @@
 	margin: 0;
 	outline: none;
 	padding: 4px 8px;
-	transition: all 400ms ease-in-out;
+	transition: all 200ms ease-in-out;
 	width: initial;
 
 	&:hover, &:focus-visible {
diff --git a/styles/v3/elements/headers.scss b/styles/v3/elements/headers.scss
index 27c9147..898267e 100644
--- a/styles/v3/elements/headers.scss
+++ b/styles/v3/elements/headers.scss
@@ -4,4 +4,7 @@
 		font-size: 1rem;
 		margin: 0;
 	}
+	h1 {
+		font-size: 1.5rem;
+	}
 }
diff --git a/styles/v3/elements/panel.scss b/styles/v3/elements/panel.scss
index 36a8f14..d256c91 100644
--- a/styles/v3/elements/panel.scss
+++ b/styles/v3/elements/panel.scss
@@ -5,5 +5,13 @@
 		@include material.elevate(2);
 		border-radius: 4px;
 		padding: var(--gap);
+
+		&--row {
+			@extend .panel;
+			display: flex;
+			flex-direction: row;
+			gap: var(--gap);
+			align-items: center;
+		}
 	}
 }
diff --git a/styles/v3/elements/text-input.scss b/styles/v3/elements/text-input.scss
new file mode 100644
index 0000000..5cbdfc7
--- /dev/null
+++ b/styles/v3/elements/text-input.scss
@@ -0,0 +1,24 @@
+@use "../mixins/material";
+
+.dotdungeon.style-v3 > .window-content input {
+	outline: none;
+	border: none;
+	@include material.elevate(3);
+	color: white;
+	transition: all 200ms ease-in-out;
+	width: auto;
+	height: auto;
+	font-size: inherit;
+
+	&:hover {
+		@include material.elevate(6);
+	}
+
+	&:focus-visible {
+		@include material.elevate(8);
+	}
+
+	&.h1 {
+		font-size: 1.5rem;
+	}
+}
diff --git a/styles/v3/index.scss b/styles/v3/index.scss
index 346c11e..95ea3f6 100644
--- a/styles/v3/index.scss
+++ b/styles/v3/index.scss
@@ -4,6 +4,7 @@
 
 /* Element-Styling */
 @use "./elements/button.scss";
+@use "./elements/text-input.scss";
 @use "./elements/headers.scss";
 @use "./elements/hr.scss";
 @use "./elements/icons.scss";
diff --git a/templates/items/untyped/v2/index.hbs b/templates/items/untyped/v2/index.hbs
index d683e8b..d57f46e 100644
--- a/templates/items/untyped/v2/index.hbs
+++ b/templates/items/untyped/v2/index.hbs
@@ -2,7 +2,7 @@
 	<div class="page-content">
 		{{> dotdungeon.untyped.v2.general }}
 		{{> dotdungeon.untyped.v2.details }}
-		{{#if computed.showSettingsTab}}
+		{{#if meta.showSettingsTab}}
 			{{> dotdungeon.untyped.v2.settings }}
 		{{/if}}
 		{{> dotdungeon.untyped.v2.effects }}
@@ -13,7 +13,7 @@
 			<button type="button" data-group="page" data-tab="general">General</button>
 			<button type="button" data-group="page" data-tab="details">Details</button>
 			<button type="button" data-group="page" data-tab="effects">Effects</button>
-			{{#if computed.showSettingsTab}}
+			{{#if meta.showSettingsTab}}
 				<button type="button" data-group="page" data-tab="settings">Settings</button>
 			{{/if}}
 		</nav>
diff --git a/templates/items/untyped/v2/tabs/details.v2.untyped.hbs b/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
index 5b4dbe9..5efd945 100644
--- a/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
+++ b/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
@@ -8,7 +8,7 @@
 	<div class="tier panel">
 		Item Rarity
 	</div>
-	{{#if computed.isEmbedded}}
+	{{#if meta.isEmbedded}}
 		<div class="location panel">
 			Item Location
 		</div>
diff --git a/templates/items/untyped/v2/tabs/general.v2.untyped.hbs b/templates/items/untyped/v2/tabs/general.v2.untyped.hbs
index 6bd3321..4c72fff 100644
--- a/templates/items/untyped/v2/tabs/general.v2.untyped.hbs
+++ b/templates/items/untyped/v2/tabs/general.v2.untyped.hbs
@@ -1,5 +1,11 @@
 <div class="tab" data-group="page" data-tab="general">
 	<div class="photo panel" style="background: yellowgreen"></div>
-	<div class="name panel"></div>
+	{{#if meta.isEditable}}
+		<input type="text" name="name" class="name panel h1" value="{{item.name}}">
+	{{else}}
+		<h1 class="name panel--row">
+			{{item.name}}
+		</h1>
+	{{/if}}
 	<div class="description panel"></div>
 </div>
diff --git a/templates/items/untyped/v2/tabs/settings.v2.untyped.hbs b/templates/items/untyped/v2/tabs/settings.v2.untyped.hbs
index 6314bec..e9fd907 100644
--- a/templates/items/untyped/v2/tabs/settings.v2.untyped.hbs
+++ b/templates/items/untyped/v2/tabs/settings.v2.untyped.hbs
@@ -1,5 +1,5 @@
 <div class="tab" data-group="page" data-tab="settings">
-	{{#if computed.isEmbedded}}
+	{{#if meta.isEmbedded}}
 		<div class="combat-relevant panel">
 			Useful in Combat?
 		</div>