diff --git a/assets/icons/logo/midgard.webp b/assets/icons/logo/midgard.webp
new file mode 100755
index 0000000..ce6ec38
Binary files /dev/null and b/assets/icons/logo/midgard.webp differ
diff --git a/lang/de.json b/lang/de.json
index b51472e..c4c7749 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -69,7 +69,7 @@
 
 	"midgard5.class": "Klasse",
 	"midgard5.race": "Rasse",
-	"midgard5.magicUsing": "zauberkundig",
+	"midgard5.magicUsing": "Zauberkundig",
 	"midgard5.gender": "Geschlecht",
 	"midgard5.weight": "Gewicht",
 	"midgard5.height": "Größe",
diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less
index e0684ab..6042772 100644
--- a/source/style/Character-sheet.less
+++ b/source/style/Character-sheet.less
@@ -8,8 +8,12 @@
 	}
 
 	h3 {
-		margin-top: 1rem;
-	}
+		padding: 0.5rem 0.5rem 0.5rem 0.5rem ;
+		text-align: left;
+		font-weight: bold;
+		background-color: dimgray;
+		color: white;
+		}
 
 	.sheet.character {
 		form {
@@ -28,14 +32,33 @@
 		}
 
 		.profile-img {
-			height: 64px;
-			width: 64px;
+			max-width: 128px;
+			height: 160px;
+			border: 0px solid black;
 		}
 
 		.description {
 			flex: 0 0 100%;
 			margin: 0;
-		}
+		}		  
+	}
+
+	.sheet-navigation {
+		margin: 4px 0;
+		background-color: lightgrey;
+		border-top: 2px solid black;
+		border-bottom: 2px solid black;
+	}
+
+	.sheet-navigation .item {
+		padding: 8px 12px 8px 12px;
+		color: black;
+		font-weight: bold;
+		font-size: large;
+	}
+
+	.sheet-navigation .active {
+		background-color: darkgrey;
 	}
 
 	.level-display {
@@ -43,8 +66,13 @@
 		font-weight: bold;
 	}
 
+	table {
+		background-color: beige;
+	} 
+
 	td, th {
 		padding: 0 0.5rem 0 0.5rem;
+		text-align: left;
 
 		&.center {
 			text-align: center;
@@ -54,8 +82,30 @@
 			width: 3rem;
 			text-align: center;
 		}
-	}
 
+		&.attribute{
+			text-align: center;
+			font-weight: bold;
+		}
+
+		&.attribute-value {
+			background: url(/icons/svg/d20-grey.svg) no-repeat;
+			background-size: 50px 50px;
+			background-position: center;
+			color: black;
+			text-align: center;
+			font-weight: bold;
+			height: 50px;
+		}
+
+		&.title {
+			padding: 0.5rem 0.5rem 0.5rem 0.5rem ;
+			text-align: left;
+			font-weight: bold;
+			background-color: dimgray;
+		  }
+	}
+	
 	input.skill {
 		width: 5rem;
 	}
@@ -77,6 +127,7 @@
 	button.roll-button {
 		background: url(/icons/svg/d20-black.svg) no-repeat;
 		background-size: 24px 24px;
+		border: #000000 solid 0px;
 		width: 26px;
 		height: 26px;
 	}
@@ -91,7 +142,7 @@
 	}
 
 	.health-bar {
-		height: 2rem;
+		height: 1rem;
 		background-color: rgba(0, 0, 0, 0.8);
 		display: flex;
 		flex-direction: row;
@@ -100,7 +151,7 @@
 		//align-items: stretch;
 
 		input {
-			flex: 0 0 3rem;
+			flex: 0 0 2rem;
 			text-align: center;
 			height: 100%;
 			background-color: rgba(109, 108, 102, 1);
@@ -112,29 +163,31 @@
 		.lp-bar-item-empty,
 		.ap-bar-item-empty {
 			flex-grow: 1;
-			background-color: rgb(201, 201, 201);
+			background-color: white;
 		}
 
 		.lp-bar-item {
 			flex-grow: 1;
-			background-color: rgb(57, 234, 139);
+			background-color: lightgreen;
 		}
 
 		.ap-bar-item {
 			flex-grow: 1;
-			background-color: rgb(57, 163, 234);
+			background-color: lightblue;
 		}
 
 		.negative-bar-item {
 			flex-grow: 1;
-			background-color: rgb(234, 57, 57);
+			background-color: red;
 		}
 	}
 
 	.attributes {
+		padding: 0.5rem 0.5rem 0.5rem 0.5rem ;
 		display: flex;
 		flex-direction: row;
 		margin-bottom: 0.5rem;
+		background-color: beige;
 
 		.attribute {
 			flex: 0 0 7rem;
diff --git a/templates/sheets/character/base_values.hbs b/templates/sheets/character/base_values.hbs
index 43866ed..e1aeab7 100644
--- a/templates/sheets/character/base_values.hbs
+++ b/templates/sheets/character/base_values.hbs
@@ -1,45 +1,18 @@
 
-<h3>{{localize "midgard5.actor-lp"}}</h3>
-<div>
-	<div class="health-bar">
-		<input name="data.lp.value" type="text" value="{{data.lp.value}}" data-dtype="Number" />
-		{{#times data.lp.max}}
-			{{#if (lt this ../data.lp.value)}}
-				<div class="lp-bar-item update-lp" data-value="{{this}}"></div>
-			{{else}}
-				<div class="lp-bar-item-empty update-lp" data-value="{{this}}"></div>
-			{{/if}}
-		{{/times}}
-		<input name="data.lp.max" type="text" value="{{data.lp.max}}" data-dtype="Number" />
-	</div>
-</div>
-
-<h3>{{localize "midgard5.actor-ap"}}</h3>
-<div>
-	<div class="health-bar">
-		<input name="data.ap.value" type="text" value="{{data.ap.value}}" data-dtype="Number" />
-		{{#times data.ap.max}}
-			{{#if (lt this ../data.ap.value)}}
-				<div class="ap-bar-item update-ap" data-value="{{this}}"></div>
-			{{else}}
-				<div class="ap-bar-item-empty update-ap" data-value="{{this}}"></div>
-			{{/if}}
-		{{/times}}
-		<input name="data.ap.max" type="text" value="{{data.ap.max}}" data-dtype="Number" />
-	</div>
-</div>
-
-<h3>Eigenschaften</h3>
-<div class="flexrow">
-	<span class="flex0">{{localize "midgard5.class"}}</span>
-	<input class="flex3" name="data.info.class" type="text" value="{{data.info.class}}" data-dtype="String" />
-	<input id="data.info.magicUsing" type="checkbox" name="data.info.magicUsing" {{checked data.info.magicUsing}}>
-	<label class="flex0" for="data.info.magicUsing">{{localize "midgard5.magicUsing"}}</label>
-	<span class="level-display">Grad {{data.calc.level}}</span>
-</div>
-
 <table>
+	<thead>
+		<tr>
+			<th class="title" colspan="4">Eigenschaften</th>
+		</tr>
+	</thead>
 	<tbody>
+		<tr height = 10px></tr>
+		<tr>
+			<td>{{localize "midgard5.magicUsing"}}</td>
+			<td><input id="data.info.magicUsing" type="checkbox" name="data.info.magicUsing" {{checked data.info.magicUsing}}></td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
 		<tr>
 			<td>{{localize "midgard5.grace"}}</td>
 			<td><input name="data.gg" type="text" value="{{data.gg}}" data-dtype="Number" /></td>
@@ -58,40 +31,56 @@
 			<td>{{localize "Bewegungsweite"}}</td>
 			<td><input name="data.movement" type="text" value="{{data.calc.stats.movement.value}}" data-dtype="Number" /></td>
 		</tr>
+		<tr height = 10px></tr>
 	</tbody>
 </table>
 
-<h3>Leiteigenschaften</h3>
-
-<div class="attributes">
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="st" attribute=data.attributes.st calc=data.calc.attributes.st}}
-	<div class="filler"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gs" attribute=data.attributes.gs calc=data.calc.attributes.gs}}
-	<div class="filler"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gw" attribute=data.attributes.gw calc=data.calc.attributes.gw}}
-	<div class="filler"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="ko" attribute=data.attributes.ko calc=data.calc.attributes.ko}}
-	<div class="filler"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="in" attribute=data.attributes.in calc=data.calc.attributes.in}}
-</div>
-
-<div class="attributes">
-	<div class="filler"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="zt" attribute=data.attributes.zt calc=data.calc.attributes.zt}}
-	<div class="attribute-filler-fixed"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="au" attribute=data.attributes.au calc=data.calc.attributes.au}}
-	<div class="attribute-filler-fixed"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="pa" attribute=data.attributes.pa calc=data.calc.attributes.pa}}
-	<div class="attribute-filler-fixed"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="wk" attribute=data.attributes.wk calc=data.calc.attributes.wk}}
-	<div class="attribute-filler-fixed"></div>
-	{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="GiT" attribute=data.stats.poisonResistance calc=data.calc.stats.poisonResistance}}
-	<div class="filler"></div>
-</div>
-
-<h3>Berechnete Werte</h3>
-<table>
+<table  style="background-color: beige;">
+	<thead>
+		<tr>
+			<th class="title">Leiteigenschaften</th>
+		</tr>
+	</thead>
 	<tbody>
+		<tr>
+			<td><div class="attributes">
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="st" attribute=data.attributes.st calc=data.calc.attributes.st}}
+				<div class="filler"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gs" attribute=data.attributes.gs calc=data.calc.attributes.gs}}
+				<div class="filler"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="gw" attribute=data.attributes.gw calc=data.calc.attributes.gw}}
+				<div class="filler"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="ko" attribute=data.attributes.ko calc=data.calc.attributes.ko}}
+				<div class="filler"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="in" attribute=data.attributes.in calc=data.calc.attributes.in}}
+			</div></td>
+		</tr>
+		<tr>
+			<td><div class="attributes">
+				<div class="filler"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="zt" attribute=data.attributes.zt calc=data.calc.attributes.zt}}
+				<div class="attribute-filler-fixed"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="au" attribute=data.attributes.au calc=data.calc.attributes.au}}
+				<div class="attribute-filler-fixed"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="pa" attribute=data.attributes.pa calc=data.calc.attributes.pa}}
+				<div class="attribute-filler-fixed"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="wk" attribute=data.attributes.wk calc=data.calc.attributes.wk}}
+				<div class="attribute-filler-fixed"></div>
+				{{> "systems/midgard5/templates/sheets/character/attribute.hbs" attributeId="GiT" attribute=data.stats.poisonResistance calc=data.calc.stats.poisonResistance}}
+				<div class="filler"></div>
+			</div></td>
+		</tr>
+	</tbody>
+</table>
+
+<table>
+	<thead>
+		<tr>
+			<th class="title" colspan="4">Berechnete Werte</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr height = 10px></tr>
 		<tr>
 			<td>{{localize "midgard5.brawl"}}</td>
 			<td class="fixed-value">{{data.calc.stats.brawl.value}}</td>
@@ -122,24 +111,21 @@
 			<td>{{localize "midgard5.resistanceBody"}}</td>
 			<td class="fixed-value">{{data.calc.stats.resistanceBody.value}}</td>
 		</tr>
+		<tr height = 10px></tr>
 	</tbody>
 </table>
 
-<h3>Beschreibung</h3>
 <table>
-	<tbody>
+	<thead>
 		<tr>
-			<td>{{localize "midgard5.race"}}</td>
-			<td>
-			<input list="races" type="search" name="data.info.race" value="{{data.info.race}}" />
-			<datalist id="races">
-				<option value="Mensch">
-				<option value="Elf">
-				<option value="Gnom">
-				<option value="Halbling">
-				<option value="Zwerg">
-			</datalist>
-			</td>
+			<th class="title" colspan="4">Beschreibung</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr height = 10px></tr>
+		<tr>
+			<td>{{localize "midgard5.origin"}}</td>
+			<td><input name="data.info.origin" type="text" value="{{data.info.origin}}" data-dtype="String" /></td>
 			<td>{{localize "midgard5.gender"}}</td>
 			<td><input name="data.info.gender" type="text" value="{{data.info.gender}}" data-dtype="String" /></td>
 		</tr>
@@ -158,15 +144,10 @@
 		<tr>
 			<td>{{localize "midgard5.caste"}}</td>
 			<td><input name="data.info.caste" type="text" value="{{data.info.caste}}" data-dtype="String" /></td>
-			<td>{{localize "midgard5.occupation"}}</td>
-			<td><input name="data.info.occupation" type="text" value="{{data.info.occupation}}" data-dtype="String" /></td>
-		</tr>
-		<tr>
-			<td>{{localize "midgard5.origin"}}</td>
-			<td><input name="data.info.origin" type="text" value="{{data.info.origin}}" data-dtype="String" /></td>
 			<td>{{localize "midgard5.faith"}}</td>
 			<td><input name="data.info.faith" type="text" value="{{data.info.faith}}" data-dtype="String" /></td>
 		</tr>
+		<tr height = 10px></tr>
 	</tbody>
 </table>
 		
diff --git a/templates/sheets/character/effects.hbs b/templates/sheets/character/effects.hbs
index cf85118..3666f93 100644
--- a/templates/sheets/character/effects.hbs
+++ b/templates/sheets/character/effects.hbs
@@ -1,8 +1,8 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "TYPES.Item.effect"}}</th>
-			<th></th>
+			<th class="title">{{localize "TYPES.Item.effect"}}</th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs
index 25015f1..efc5363 100644
--- a/templates/sheets/character/gear.hbs
+++ b/templates/sheets/character/gear.hbs
@@ -1,10 +1,10 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "TYPES.Item.weapon"}}</th>
-			<th class="fixed-value">{{localize "midgard5.ew"}}</th>
-			<th class="fixed-value"></th>
-			<th class="fixed-value"></th>
+			<th class="title">{{localize "TYPES.Item.weapon"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -29,10 +29,10 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "ITEM.TypeDefensiveWeapon"}}</th>
-			<th class="fixed-value">{{localize "midgard5.ew"}}</th>
-			<th class="fixed-value"></th>
-			<th class="fixed-value"></th>
+			<th class="title">{{localize "ITEM.TypeDefensiveWeapon"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -71,14 +71,14 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "TYPES.Item.armor"}}</th>
-			<th class="fixed-value">{{localize "midgard5.actor-lp-short"}}</th>
-			<th class="fixed-value">{{localize "midgard5.actor-ap-short"}}</th>
-			<th class="fixed-value">{{localize "midgard5.attackBonus-short"}}</th>
-			<th class="fixed-value">{{localize "midgard5.defenseBonus-short"}}</th>
-			<th class="fixed-value">B</th>
-			<th class="fixed-value">Gw</th>
-			<th class="fixed-value"></th>
+			<th class="title">{{localize "TYPES.Item.armor"}}</th>
+			<th class="title">{{localize "midgard5.actor-lp-short"}}</th>
+			<th class="title">{{localize "midgard5.actor-ap-short"}}</th>
+			<th class="title">{{localize "midgard5.attackBonus-short"}}</th>
+			<th class="title">{{localize "midgard5.defenseBonus-short"}}</th>
+			<th class="title">B</th>
+			<th class="title">Gw</th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -105,8 +105,8 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "TYPES.Item.item"}}</th>
-			<th></th>
+			<th class="title">{{localize "TYPES.Item.item"}}</th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/templates/sheets/character/kampfkuenste.hbs b/templates/sheets/character/kampfkuenste.hbs
index aca42af..e2b9ce0 100644
--- a/templates/sheets/character/kampfkuenste.hbs
+++ b/templates/sheets/character/kampfkuenste.hbs
@@ -1,10 +1,10 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "ITEM.type.kampfkunst"}}</th>
-			<th>{{localize "midgard5.ew"}}</th>
-			<th></th>
-			<th></th>
+			<th class="title">{{localize "ITEM.type.kampfkunst"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs
index 9f7f508..16b76fe 100644
--- a/templates/sheets/character/main.hbs
+++ b/templates/sheets/character/main.hbs
@@ -1,7 +1,95 @@
 <form class="actor-sheet {{cssClass}}" autocomplete="off">
 	<header class="sheet-header">
-		<img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" />
-		<h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name" /></h1>
+		<table style="padding: 5px;">
+			<tr height = 5px></tr>
+			<tr>
+				<td style="text-align: left;" colspan="4" rowspan="2"><img  style="border: 0px solid black;" src="/systems/midgard5/assets/icons/logo/midgard.webp" alt="Midgard"></td>
+				<td colspan="5" style="font-size: x-large; font-weigh: bold;"><input name="name" type="text" value="{{actor.name}}" data-dtype="String"  /></td>
+				<td style="font-size: x-large; font-weigh: bold; text-align: center; text-align-vertical: middle;" ><div style="border: 2px solid black; border-radius: 10px; background-color: white;">{{data.calc.level}}</div></td>
+			</tr>
+			<tr>
+				<td colspan="5"><b>Name</b></td>
+				<td style="text-align: center;"><b>Grad</b></td>		
+			</tr>
+			<tr height = 10px></tr>
+			<tr>
+				<td rowspan="8" width=128><img style="max-width: 128px; height: 160px; border: 0px solid black;" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" /></td>
+				<td colspan="3">
+					<input list="races" type="search" name="data.info.race" value="{{data.info.race}}" />
+					<datalist id="races">
+						<option value="Mensch">
+						<option value="Elf">
+						<option value="Gnom">
+						<option value="Halbling">
+						<option value="Zwerg">
+					</datalist>
+				</td>
+				<td colspan="3"><input name="data.info.class" type="text" value="{{data.info.class}}" data-dtype="String" /></td>
+				<td colspan="3"><b><input name="data.info.occupation" type="text" value="{{data.info.occupation}}" data-dtype="String" /></b></td>
+			</tr>
+			<tr>
+				<td colspan="3"><b>{{localize "midgard5.race"}}</b></td>
+				<td colspan="3"><b>{{localize "midgard5.class"}}</b></td>
+				<td colspan="3"><b>{{localize "midgard5.occupation"}}</b></td>
+			</tr>
+			<tr height = 10px></tr>
+			<tr>
+				<td><b>{{localize "midgard5.actor-lp-short"}}</b></td>
+				<td colspan="8">
+					<div class="health-bar">
+						<input name="data.lp.value" type="text" value="{{data.lp.value}}" data-dtype="Number" />
+						{{#times data.lp.max}}
+							{{#if (lt this ../data.lp.value)}}
+								<div class="lp-bar-item update-lp" data-value="{{this}}"></div>
+							{{else}}
+								<div class="lp-bar-item-empty update-lp" data-value="{{this}}"></div>
+							{{/if}}
+						{{/times}}
+						<input name="data.lp.max" type="text" value="{{data.lp.max}}" data-dtype="Number" />
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td><b>{{localize "midgard5.actor-ap-short"}}</b></td>
+				<td colspan="8">
+					<div class="health-bar">
+						<input name="data.ap.value" type="text" value="{{data.ap.value}}" data-dtype="Number" />
+						{{#times data.ap.max}}
+							{{#if (lt this ../data.ap.value)}}
+								<div class="ap-bar-item update-ap" data-value="{{this}}"></div>
+							{{else}}
+								<div class="ap-bar-item-empty update-ap" data-value="{{this}}"></div>
+							{{/if}}
+						{{/times}}
+						<input name="data.ap.max" type="text" value="{{data.ap.max}}" data-dtype="Number" />
+					</div>
+				</td>
+			</tr>
+			<tr height = 10px></tr>
+			<tr>
+				<td class="attribute">{{localize "midgard5.actor-st"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-ko"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-au"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-gs"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-in"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-pa"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-gw"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-zt"}}</td>
+				<td class="attribute">{{localize "midgard5.actor-wk"}}</td>
+			</tr>
+			<tr>
+				<td class="attribute-value">{{data.calc.attributes.st.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.ko.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.au.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.gs.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.in.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.pa.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.gw.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.zt.value}}</td>
+				<td class="attribute-value">{{data.calc.attributes.wk.value}}</td>
+			</tr>
+			<tr height = 5px></tr>
+		</table>
 	</header>
 
 	{{!-- Character Sheet Navigation --}}
diff --git a/templates/sheets/character/skills.hbs b/templates/sheets/character/skills.hbs
index 115dd3e..e740565 100644
--- a/templates/sheets/character/skills.hbs
+++ b/templates/sheets/character/skills.hbs
@@ -1,13 +1,13 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "midgard5.learned-skill"}}</th>
-			<th>{{localize "midgard5.fw"}}</th>
-			<th>{{localize "midgard5.bonus"}}</th>
-			<th>{{localize "midgard5.ew"}}</th>
-			<th>{{localize "midgard5.pp-short"}}</th>
-			<th></th>
-			<th></th>
+			<th class="title">{{localize "midgard5.learned-skill"}}</th>
+			<th class="title">{{localize "midgard5.fw"}}</th>
+			<th class="title">{{localize "midgard5.bonus"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title">{{localize "midgard5.pp-short"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -28,13 +28,13 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "midgard5.language"}}</th>
-			<th>{{localize "midgard5.fw"}}</th>
-			<th>{{localize "midgard5.bonus"}}</th>
-			<th>{{localize "midgard5.ew"}}</th>
-			<th>{{localize "midgard5.pp-short"}}</th>
-			<th></th>
-			<th></th>
+			<th class="title">{{localize "midgard5.language"}}</th>
+			<th class="title">{{localize "midgard5.fw"}}</th>
+			<th class="title">{{localize "midgard5.bonus"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title">{{localize "midgard5.pp-short"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -55,12 +55,12 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "midgard5.innate-ability"}}</th>
-			<th>{{localize "midgard5.fw"}}</th>
-			<th>{{localize "midgard5.bonus"}}</th>
-			<th>{{localize "midgard5.ew"}}</th>
-			<th></th>
-			<th></th>
+			<th class="title">{{localize "midgard5.innate-ability"}}</th>
+			<th class="title">{{localize "midgard5.fw"}}</th>
+			<th class="title">{{localize "midgard5.bonus"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -80,13 +80,13 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "midgard5.weapon-skill"}}</th>
-			<th>{{localize "midgard5.fw"}}</th>
-			<th>{{localize "midgard5.bonus"}}</th>
-			<th>{{localize "midgard5.ew"}}</th>
-			<th>{{localize "midgard5.pp-short"}}</th>
-			<th></th>
-			<th></th>
+			<th class="title">{{localize "midgard5.weapon-skill"}}</th>
+			<th class="title">{{localize "midgard5.fw"}}</th>
+			<th class="title">{{localize "midgard5.bonus"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title">{{localize "midgard5.pp-short"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -107,14 +107,14 @@
 <table>
 	<thead>
 		<tr>
-			<th></th>
-			<th>{{localize "midgard5.unlearned-skill"}}</th>
-			<th>{{localize "midgard5.fw"}}</th>
-			<th>{{localize "midgard5.bonus"}}</th>
-			<th>{{localize "midgard5.ew"}}</th>
-			<th>{{localize "midgard5.pp-short"}}</th>
-			<th></th>
-			<th></th>
+			<th class="title"></th>
+			<th class="title">{{localize "midgard5.unlearned-skill"}}</th>
+			<th class="title">{{localize "midgard5.fw"}}</th>
+			<th class="title">{{localize "midgard5.bonus"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title">{{localize "midgard5.pp-short"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/templates/sheets/character/spells.hbs b/templates/sheets/character/spells.hbs
index 715016b..2bf55a7 100644
--- a/templates/sheets/character/spells.hbs
+++ b/templates/sheets/character/spells.hbs
@@ -1,10 +1,10 @@
 <table>
 	<thead>
 		<tr>
-			<th>{{localize "TYPES.Item.spell"}}</th>
-			<th>{{localize "midgard5.ew"}}</th>
-			<th></th>
-			<th></th>
+			<th class="title">{{localize "TYPES.Item.spell"}}</th>
+			<th class="title">{{localize "midgard5.ew"}}</th>
+			<th class="title"></th>
+			<th class="title"></th>
 		</tr>
 	</thead>
 	<tbody>