diff --git a/internal/app/characters/Lavitz.go b/internal/app/characters/Lavitz.go
index d8d982e..af0a432 100644
--- a/internal/app/characters/Lavitz.go
+++ b/internal/app/characters/Lavitz.go
@@ -2,12 +2,12 @@ package characters
 
 func Lavitz() Character {
 	return Character{
-		XP:			Attribute{0x558,4,true},
-		HP: 		Attribute{0x560,2,true},
-		Weapon:		Attribute{0x598,1,false},
-		Helmet:    	Attribute{0x599,1,false},
-		Chest:     	Attribute{0x59A,1,false},
-		Boots:     	Attribute{0x59B,1,false},
-		Accessory: 	Attribute{0x59C,1,false},
+		XP:			Attribute{0x584,4,true},
+		HP: 		Attribute{0x534,2,true}, //TODO map this
+		Weapon:		Attribute{0x56C,1,false},
+		Helmet:    	Attribute{0x56D,1,false},
+		Chest:     	Attribute{0x56E,1,false},
+		Boots:     	Attribute{0x56F,1,false},
+		Accessory: 	Attribute{0x570,1,false},
 	}
 }
diff --git a/internal/app/characters/Shana.go b/internal/app/characters/Shana.go
index bf4def2..86ee051 100644
--- a/internal/app/characters/Shana.go
+++ b/internal/app/characters/Shana.go
@@ -2,12 +2,12 @@ package characters
 
 func Shana() Character {
 	return Character{
-		XP:			Attribute{0x584,4,true},
-		HP: 		Attribute{0x534,2,true}, //TODO map this
-		Weapon:		Attribute{0x56C,1,false},
-		Helmet:    	Attribute{0x56D,1,false},
-		Chest:     	Attribute{0x56E,1,false},
-		Boots:     	Attribute{0x56F,1,false},
-		Accessory: 	Attribute{0x570,1,false},
+		XP:			Attribute{0x558,4,true},
+		HP: 		Attribute{0x560,2,true},
+		Weapon:		Attribute{0x598,1,false},
+		Helmet:    	Attribute{0x599,1,false},
+		Chest:     	Attribute{0x59A,1,false},
+		Boots:     	Attribute{0x59B,1,false},
+		Accessory: 	Attribute{0x59C,1,false},
 	}
 }
diff --git a/internal/app/inventory/Weapons.go b/internal/app/inventory/Weapons.go
index ae5fe3c..c4fef04 100644
--- a/internal/app/inventory/Weapons.go
+++ b/internal/app/inventory/Weapons.go
@@ -1,6 +1,6 @@
 package inventory
 
-func Weapons() Inventory {
+func Swords() Inventory {
 	return []Item {
 		{0,"Broad Sword"},
 		{1,"Bastard Sword"},
@@ -10,11 +10,21 @@ func Weapons() Inventory {
 		{5,"Fairy Sword"},
 		{6,"Claymore"},
 		{7,"Soul Eater"},
+	}
+}
+
+func Axes() Inventory {
+	return []Item {
 		{8,"Axe"},
 		{9,"Tomahawk"},
 		{10,"Battle Axe"},
 		{11,"Great Axe"},
 		{12,"Indora's Axe"},
+	}
+}
+
+func Daggers() Inventory {
+	return []Item{
 		{13,"Rapier"},
 		{19,"Demon Stiletto"},
 		{14,"Shadow Cutter"},
@@ -22,6 +32,11 @@ func Weapons() Inventory {
 		{16,"Flamberge"},
 		{17,"Gladius"},
 		{18,"Dragon Buster"},
+	}
+}
+
+func Spears() Inventory {
+	return []Item {
 		{20,"Spear"},
 		{21,"Lance"},
 		{26,"Twister Glaive"},
@@ -29,6 +44,11 @@ func Weapons() Inventory {
 		{23,"Spear Of Terror"},
 		{24,"Partisan"},
 		{25,"Halberd"},
+	}
+}
+
+func Bows() Inventory {
+	return []Item {
 		{27,"Short Bow"},
 		{28,"Sparkle Arrow"},
 		{29,"Long Bow"},
@@ -36,12 +56,22 @@ func Weapons() Inventory {
 		{31,"Virulent Arrow"},
 		{33,"Arrow Of Force"},
 		{32,"Detonate Arrow"},
+	}
+}
+
+func Maces() Inventory {
+	return []Item {
 		{34,"Mace"},
 		{35,"Morning Star"},
 		{36,"War Hammer"},
 		{37,"Heavy Mace"},
 		{39,"Pretty Hammer"},
 		{38,"Basher"},
+	}
+}
+
+func Knuckles() Inventory {
+	return []Item {
 		{40,"Iron Knuckle"},
 		{41,"Beast Fang"},
 		{42,"Diamond Claw"},
diff --git a/internal/app/ui/Form.go b/internal/app/ui/Form.go
index 5a2bccf..6ccd9a8 100644
--- a/internal/app/ui/Form.go
+++ b/internal/app/ui/Form.go
@@ -33,7 +33,7 @@ func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) *fyne.
 	box1 := widget.NewVBox()
 	box1.Append(widget.NewLabel("Dart"))
 	box1.Append(widget.NewLabel("Weapon"))
-	box1.Append(createSelect(inventory.Weapons(), dart.Weapon, slot))
+	box1.Append(createSelect(inventory.Swords(), dart.Weapon, slot))
 	box1.Append(widget.NewLabel("Armor"))
 	box1.Append(createSelect(inventory.Armor(), dart.Chest, slot))
 	box1.Append(widget.NewLabel("Headgear"))
@@ -47,7 +47,7 @@ func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) *fyne.
 	box2 := widget.NewVBox()
 	box2.Append(widget.NewLabel("Shana"))
 	box2.Append(widget.NewLabel("Weapon"))
-	box2.Append(createSelect(inventory.Weapons(), shana.Weapon, slot))
+	box2.Append(createSelect(inventory.Bows(), shana.Weapon, slot))
 	box2.Append(widget.NewLabel("Armor"))
 	box2.Append(createSelect(inventory.Armor(), shana.Chest, slot))
 	box2.Append(widget.NewLabel("Headgear"))
@@ -61,7 +61,7 @@ func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) *fyne.
 	box3 := widget.NewVBox()
 	box3.Append(widget.NewLabel("Lavitz"))
 	box3.Append(widget.NewLabel("Weapon"))
-	box3.Append(createSelect(inventory.Weapons(), lavitz.Weapon, slot))
+	box3.Append(createSelect(inventory.Spears(), lavitz.Weapon, slot))
 	box3.Append(widget.NewLabel("Armor"))
 	box3.Append(createSelect(inventory.Armor(), lavitz.Chest, slot))
 	box3.Append(widget.NewLabel("Headgear"))
diff --git a/scripts/package.sh b/scripts/package.sh
index 47dafc2..3f480c6 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 
-fyne package -executable ./build/LODeditor -os darwin -icon ./assets/icon.png
+set -ex
+
+#export PATH=$PATH:$(go env GOPATH)/bin
+fyne package -executable ./build/LODeditor -os darwin -icon ./assets/icon.png
\ No newline at end of file