diff --git a/plugin/src/main/resources/messages/property-hover/remove.txt b/plugin/src/main/resources/messages/property-hover/remove.txt
index e69de29..20f6830 100644
--- a/plugin/src/main/resources/messages/property-hover/remove.txt
+++ b/plugin/src/main/resources/messages/property-hover/remove.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc property remove <gold><id> <property>
+
+<gray>Command used to unset properties on npcs
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/property-hover/set.txt b/plugin/src/main/resources/messages/property-hover/set.txt
index e69de29..9f2888e 100644
--- a/plugin/src/main/resources/messages/property-hover/set.txt
+++ b/plugin/src/main/resources/messages/property-hover/set.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc property set <gold><id> <property> <value>
+
+<gray>Command used to customize npcs with custom properties
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/center.txt b/plugin/src/main/resources/messages/root-hover/center.txt
index e69de29..0fa96f1 100644
--- a/plugin/src/main/resources/messages/root-hover/center.txt
+++ b/plugin/src/main/resources/messages/root-hover/center.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc center <gold><id>
+
+<gray>Command used to move an npc to the center of the block it's currently occupying
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/changeid.txt b/plugin/src/main/resources/messages/root-hover/changeid.txt
index e69de29..a819ff2 100644
--- a/plugin/src/main/resources/messages/root-hover/changeid.txt
+++ b/plugin/src/main/resources/messages/root-hover/changeid.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc changeid <gold><id> <new id>
+
+<gray>Command used to change the id of an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/create.txt b/plugin/src/main/resources/messages/root-hover/create.txt
index e69de29..4eb58b7 100644
--- a/plugin/src/main/resources/messages/root-hover/create.txt
+++ b/plugin/src/main/resources/messages/root-hover/create.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc create <gold><id> <type>
+
+<gray>Command used to create an npc of a given type
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/delete.txt b/plugin/src/main/resources/messages/root-hover/delete.txt
index e69de29..69d0cdb 100644
--- a/plugin/src/main/resources/messages/root-hover/delete.txt
+++ b/plugin/src/main/resources/messages/root-hover/delete.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc delete <gold><id>
+
+<gray>Command used to delete an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/list.txt b/plugin/src/main/resources/messages/root-hover/list.txt
index e69de29..4a2f00e 100644
--- a/plugin/src/main/resources/messages/root-hover/list.txt
+++ b/plugin/src/main/resources/messages/root-hover/list.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc list
+
+<gray>Command used to list all npcs
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/lookatme.txt b/plugin/src/main/resources/messages/root-hover/lookatme.txt
index e69de29..23c60a6 100644
--- a/plugin/src/main/resources/messages/root-hover/lookatme.txt
+++ b/plugin/src/main/resources/messages/root-hover/lookatme.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc lookatme <gold><id>
+
+<gray>Command used to set the rotation of an npc to be looking at your current location
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/move.txt b/plugin/src/main/resources/messages/root-hover/move.txt
index e69de29..4edbf67 100644
--- a/plugin/src/main/resources/messages/root-hover/move.txt
+++ b/plugin/src/main/resources/messages/root-hover/move.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc move <gold><id>
+
+<gray>Command used to set the location of an npc to your current location
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/near.txt b/plugin/src/main/resources/messages/root-hover/near.txt
index e69de29..6129a95 100644
--- a/plugin/src/main/resources/messages/root-hover/near.txt
+++ b/plugin/src/main/resources/messages/root-hover/near.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc near <gold><distance>
+
+<gray>Command used to check which npcs are within a given radius around you
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/setlocation.txt b/plugin/src/main/resources/messages/root-hover/setlocation.txt
index e69de29..7b085f6 100644
--- a/plugin/src/main/resources/messages/root-hover/setlocation.txt
+++ b/plugin/src/main/resources/messages/root-hover/setlocation.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc setlocation <gold><id> <x> <y> <z>
+
+<gray>Command used to manually adjust an npc's location
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/setrotation.txt b/plugin/src/main/resources/messages/root-hover/setrotation.txt
index e69de29..de1f808 100644
--- a/plugin/src/main/resources/messages/root-hover/setrotation.txt
+++ b/plugin/src/main/resources/messages/root-hover/setrotation.txt
@@ -0,0 +1,3 @@
+<gray>Usage <gold>» <yellow>/npc setrotation <gold><id> <yaw> <pitch>
+
+<gray>Command used to manually adjust an npc's rotation
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/teleport.txt b/plugin/src/main/resources/messages/root-hover/teleport.txt
index 4e33f62..6c4a944 100644
--- a/plugin/src/main/resources/messages/root-hover/teleport.txt
+++ b/plugin/src/main/resources/messages/root-hover/teleport.txt
@@ -1,6 +1,3 @@
-<gray>Examples:
- <gold>* <yellow>/npc teleport <gold>cool_npc1
- <gold>* <yellow>/npc teleport <gold>my_npc
- <gold>* <yellow>/npc teleport <gold>12
+<gray>Usage <gold>» <yellow>/npc teleport <gold><id>
 
 <gray>Command used to teleport yourself to an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/toggle.txt b/plugin/src/main/resources/messages/root-hover/toggle.txt
index 21bb7ad..85cd1de 100644
--- a/plugin/src/main/resources/messages/root-hover/toggle.txt
+++ b/plugin/src/main/resources/messages/root-hover/toggle.txt
@@ -1,6 +1,3 @@
-<gray>Examples:
- <gold>* <yellow>/npc toggle <gold>cool_npc1
- <gold>* <yellow>/npc toggle <gold>my_npc
- <gold>* <yellow>/npc toggle <gold>12
+<gray>Usage <gold>» <yellow>/npc toggle <gold><id>
 
 <gray>Command used to enable or disable an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/root-hover/type.txt b/plugin/src/main/resources/messages/root-hover/type.txt
index 90a123a..93fc3f1 100644
--- a/plugin/src/main/resources/messages/root-hover/type.txt
+++ b/plugin/src/main/resources/messages/root-hover/type.txt
@@ -1,6 +1,3 @@
-<gray>Examples:
- <gold>* <yellow>/npc type <gold>cool_npc1 zombie
- <gold>* <yellow>/npc type <gold>my_npc skeleton
- <gold>* <yellow>/npc type <gold>12 creeper
+<gray>Usage <gold>» <yellow>/npc type <gold><id> <type>
 
 <gray>Command used to change the type of an npc
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/storage-hover/import.txt b/plugin/src/main/resources/messages/storage-hover/import.txt
index ac114a5..0f758c2 100644
--- a/plugin/src/main/resources/messages/storage-hover/import.txt
+++ b/plugin/src/main/resources/messages/storage-hover/import.txt
@@ -1,6 +1,8 @@
-<gray>Examples:
- <gold>* <yellow>/npc storage import <gold>znpcs
- <gold>* <yellow>/npc storage import <gold>znpcsplus_legacy
- <gold>* <yellow>/npc storage import <gold>citizens
+<gray>Usage <gold>» <yellow>/npc storage import <gold><importer>
 
-<gray>Command used to import npcs from a different npc plugin
\ No newline at end of file
+<gray>Importers:
+ <gold>* <yellow>znpcs <gray>- Imports npcs from the ZNPCs plugin
+ <gold>* <yellow>znpcsplus_legacy <gray>- Imports npcs from legacy versions of ZNPCsPlus
+ <gold>* <yellow>citizens <gray>- Imports npcs from the Citizens plugin
+
+<gray>Command used to import npcs from a different source
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/storage-hover/reload.txt b/plugin/src/main/resources/messages/storage-hover/reload.txt
index ab56365..45d05a7 100644
--- a/plugin/src/main/resources/messages/storage-hover/reload.txt
+++ b/plugin/src/main/resources/messages/storage-hover/reload.txt
@@ -1,5 +1,4 @@
-<gray>Examples:
- <gold>* <yellow>/npc storage reload
+<gray>Usage <gold>» <yellow>/npc storage reload
 
 <gray>Command used to re-load all npcs from storage
 <red>Warning: This command will delete all unsaved changes to npcs
\ No newline at end of file
diff --git a/plugin/src/main/resources/messages/storage-hover/save.txt b/plugin/src/main/resources/messages/storage-hover/save.txt
index 40faf0a..a255ede 100644
--- a/plugin/src/main/resources/messages/storage-hover/save.txt
+++ b/plugin/src/main/resources/messages/storage-hover/save.txt
@@ -1,4 +1,3 @@
-<gray>Examples:
- <gold>* <yellow>/npc storage save
+<gray>Usage <gold>» <yellow>/npc storage save
 
 <gray>Command used to save the currently loaded npcs to storage
\ No newline at end of file