diff --git a/client/Commands.cs b/client/Commands.cs
index bad68e2..d729571 100644
--- a/client/Commands.cs
+++ b/client/Commands.cs
@@ -1,6 +1,6 @@
 using Dalamud.Game.Command;
 
-namespace OrangeGuidanceTomestone; 
+namespace OrangeGuidanceTomestone;
 
 internal class Commands : IDisposable {
     private Plugin Plugin { get; }
@@ -8,13 +8,15 @@ internal class Commands : IDisposable {
     internal Commands(Plugin plugin) {
         this.Plugin = plugin;
 
-        this.Plugin.CommandManager.AddHandler("/ogt", new CommandInfo(this.OnCommand));
+        this.Plugin.CommandManager.AddHandler("/ogt", new CommandInfo(this.OnCommand) {
+            HelpMessage = "Toggle UI",
+        });
     }
 
     public void Dispose() {
         this.Plugin.CommandManager.RemoveHandler("/ogt");
     }
-    
+
     private void OnCommand(string command, string arguments) {
         this.Plugin.Ui.MainWindow.Visible ^= true;
     }
diff --git a/client/OrangeGuidanceTomestone.csproj b/client/OrangeGuidanceTomestone.csproj
index 5715175..c7223d0 100755
--- a/client/OrangeGuidanceTomestone.csproj
+++ b/client/OrangeGuidanceTomestone.csproj
@@ -66,6 +66,7 @@
 
     <ItemGroup>
         <EmbeddedResource Include="../server/packs/*.yaml" LinkBase="packs"/>
+        <EmbeddedResource Remove="../server/packs/*_old.yaml"/>
     </ItemGroup>
 
 </Project>
diff --git a/client/Plugin.cs b/client/Plugin.cs
index 8060f8d..edb5127 100644
--- a/client/Plugin.cs
+++ b/client/Plugin.cs
@@ -43,15 +43,15 @@ public class Plugin : IDalamudPlugin {
         }
 
         this.Vfx = new Vfx();
-        this.Ui = new PluginUi(this);
         this.Messages = new Messages(this);
+        this.Ui = new PluginUi(this);
         this.Commands = new Commands(this);
     }
 
     public void Dispose() {
         this.Commands.Dispose();
-        this.Messages.Dispose();
         this.Ui.Dispose();
+        this.Messages.Dispose();
         this.Vfx.Dispose();
     }
 
diff --git a/client/Template.cs b/client/Template.cs
deleted file mode 100644
index 46adedb..0000000
--- a/client/Template.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// using System.Text;
-//
-// namespace OrangeGuidanceTomestone;
-//
-// internal class Template {
-//     internal static readonly Template[] All = {
-//         // new(new []{})
-//     };
-//
-//     internal IReadOnlyList<TemplatePart> Parts { get; }
-//     // internal IReadOnlyList<string> Conjunctions { get; }
-//     internal uint Variables { get; }
-//
-//
-//     internal Template(IReadOnlyList<TemplatePart> parts) {
-//         this.Parts = parts;
-//         // this.Conjunctions = conjunctions;
-//
-//         // if (this.Parts.Count - 1 != this.Conjunctions.Count) {
-//             // throw new ArgumentException("should have one less conjunction than parts");
-//         // }
-//         
-//         this.Variables = (uint) this.Parts.Select(part => (int) part.Variables).Sum();
-//     }
-//
-//     internal string Format(params object[] variables) {
-//         var result = new StringBuilder();
-//         var varIdx = 0;
-//         for (var i = 0; i < this.Parts.Count; i++) {
-//             var part = this.Parts[i];
-//             result.Append(part.Format(variables[varIdx..(varIdx + (int) part.Variables)]));
-//             varIdx += (int) part.Variables;
-//
-//             // if (i == this.Parts.Count - 1) {
-//                 // continue;
-//             // }
-//
-//             // var conj = this.Conjunctions[i - 1];
-//             // result.Append(conj)
-//         }
-//
-//         return result.ToString();
-//     }
-// }
-//
-// internal class TemplatePart {
-//     internal string Template { get; }
-//     internal uint Variables { get; }
-//
-//     internal TemplatePart(string template, uint variables) {
-//         this.Template = template;
-//         var count = 0;
-//         var lastIndex = -1;
-//         while (true) {
-//             lastIndex = this.Template.IndexOf("%s", lastIndex + 1, StringComparison.Ordinal);
-//             if (lastIndex == -1) {
-//                 break;
-//             }
-//
-//             count += 1;
-//         }
-//
-//         this.Variables = count;
-//     }
-//
-//     internal string Format(params object[] variables) {
-//         return string.Format(this.Template, variables);
-//     }
-// }
diff --git a/server/packs/ffxiv.yaml b/server/packs/ffxiv.yaml
index 7b044e1..ba6fc4e 100644
--- a/server/packs/ffxiv.yaml
+++ b/server/packs/ffxiv.yaml
@@ -1,5 +1,5 @@
 name: FINAL FANTASY XIV
-id: 7cd9e479-080a-4fec-9511-41a53034c2ad
+id: 7fe38343-efb5-477b-a17f-71d910ae075b
 
 templates:
   - '{0} ahead'
@@ -63,6 +63,8 @@ words:
       - Warrior of Light
       - Warrior of Darkness
       - Garlean
+      - Allagan
+      - Ascian
       - paladin
       - warrior
       - dark knight
@@ -109,6 +111,22 @@ words:
       - pair
       - trio
       - thief
+      - uplander
+
+  - name: The Twelve
+    words:
+      - Halone
+      - Menphina
+      - Thaliak
+      - Nymeia
+      - Llymlaen
+      - Oschon
+      - Byregot
+      - Rhalgr
+      - Azeyma
+      - Nald'thal
+      - Nophica
+      - Althyk
 
   - name: Things
     words:
@@ -129,6 +147,8 @@ words:
       - aggro
       - pursuit
       - confusion
+      - single-target
+      - area of effect
 
   - name: Actions
     words:
@@ -142,10 +162,15 @@ words:
       - skill
       - summoning
 
-  - name: Wildlife
+  - name: Beings
     words:
       - goobbue
       - chocobo
+      - cactuar
+      - porxie
+      - moogle
+      - goblin
+      - dragon
 
   - name: Situations
     words:
@@ -170,6 +195,8 @@ words:
 
   - name: Places
     words:
+      - Eorzea
+      - Garlemald
       - high road
       - bridge
       - castle
@@ -262,5 +289,34 @@ words:
 
   - name: Phrases
     words:
-      - this was not my intention
+      - good luck
+      - look carefully
+      - listen carefully
+      - think carefully
+      - well done
+      - I did it!
+      - I've failed...
+      - here!
+      - not here!
+      - don't you dare!
+      - do it!
+      - I can't take this...
+      - don't think
+      - so lonely...
+      - here again...
+      - just getting started
+      - stay calm
+      - keep moving
+      - turn back
+      - give up
+      - don't give up
+      - help me...
+      - I don't believe it...
+      - too high up
+      - I want to go home...
+      - it's like a dream...
       - seems familiar...
+      - beautiful...
+      - you don't have the right
+      - are you ready?
+      - this was not my intention
diff --git a/server/packs/ffxiv_old.yaml b/server/packs/ffxiv_old.yaml
new file mode 100644
index 0000000..6d4d493
--- /dev/null
+++ b/server/packs/ffxiv_old.yaml
@@ -0,0 +1,281 @@
+name: FINAL FANTASY XIV (v1)
+id: 7cd9e479-080a-4fec-9511-41a53034c2ad
+
+templates:
+  - '{0} ahead'
+  - 'No {0} ahead'
+  - '{0} required ahead'
+  - 'Be wary of {0}'
+  - 'Try {0}'
+  - 'Likely {0}'
+  - 'First off, {0}'
+  - 'Seek {0}'
+  - 'Still no {0}...'
+  - 'Why is it always {0}?'
+  - 'If only I had a {0}...'
+  - 'Didn''t expect {0}...'
+  - 'Visions of {0}...'
+  - 'Could this be a {0}?'
+  - 'Time for {0}'
+  - '{0}, O {0}'
+  - 'Behold, {0}!'
+  - 'Offer {0}'
+  - 'Praise the {0}'
+  - 'Let there be {0}'
+  - 'Ahh, {0}...'
+  - 'Such {0}...'
+  - '{0}'
+  - '{0}!'
+  - '{0}?'
+  - '{0}...'
+
+conjunctions:
+  - 'and then'
+  - 'or'
+  - 'but'
+  - 'therefore'
+  - 'in short'
+  - 'except'
+  - 'by the way'
+  - 'so to speak'
+  - 'all the more'
+  - ','
+
+words:
+  - name: Enemies
+    words:
+      - enemy
+      - weak foe
+      - strong foe
+      - monster
+      - voidsent
+      - dragon
+      - boss
+      - group
+      - zombie
+      - wolf
+      - skeleton
+      - goblin
+      - primal
+
+  - name: People
+    words:
+      - Warrior of Light
+      - Warrior of Darkness
+      - Garlean
+      - paladin
+      - warrior
+      - dark knight
+      - gunbreaker
+      - white mage
+      - scholar
+      - astrologian
+      - sage
+      - monk
+      - ninja
+      - dragoon
+      - samurai
+      - reaper
+      - bard
+      - machinist
+      - dancer
+      - black mage
+      - summoner
+      - red mage
+      - blue mage
+      - merchant
+      - teacher
+      - master
+      - friend
+      - lover
+      - angel
+      - sinner
+      - good sort
+      - wicked sort
+      - plump sort
+      - skinny sort
+      - lovable sort
+      - pathetic sort
+      - strange sort
+      - nimble sort
+      - laggardly sort
+      - invisible sort
+      - unfathomable sort
+      - giant sort
+      - liar
+      - traitor
+      - hero
+      - champion
+      - pair
+      - trio
+      - thief
+      - Halone
+      - Menphina
+      - Thaliak
+      - Nymeia
+      - Llymlaen
+      - Oschon
+      - Byregot
+      - Rhalgr
+      - Azeyma
+      - 'Nald''thal'
+      - Nophica
+      - Althyk
+
+  - name: Things
+    words:
+      - item
+      - necessary item
+      - something
+      - something incredible
+      - weapon
+      - crystal
+      - job stone
+      - map
+
+  - name: Battle Tactics
+    words:
+      - stealth
+      - kiting
+      - jumping off
+      - aggro
+      - pursuit
+      - confusion
+      - single-target
+      - area of effect
+
+  - name: Actions
+    words:
+      - attacking
+      - healing
+      - jumping
+      - casting
+      - crafting
+      - running
+      - walking
+      - skill
+      - summoning
+
+  - name: Wildlife
+    words:
+      - goobbue
+      - chocobo
+      - cactuar
+
+  - name: Situations
+    words:
+      - morning
+      - noon
+      - evening
+      - night
+      - clear sky
+      - overcast
+      - rain
+      - storm
+      - mist
+      - snow
+      - battle
+      - ritual
+      - explosion
+      - safety
+      - danger
+      - hidden path
+      - secret passage
+      - dead end
+
+  - name: Places
+    words:
+      - high road
+      - bridge
+      - castle
+      - fort
+      - city
+      - ruins
+      - church
+      - tower
+      - camp site
+      - house
+      - tunnel
+      - cave
+      - great tree
+      - surface
+      - underground
+      - forest
+      - river
+      - lake
+      - mountain
+      - valley
+      - cliff
+      - waterside
+      - nest
+      - hole
+
+  - name: Directions
+    words:
+      - east
+      - west
+      - south
+      - north
+      - ahead
+      - behind
+      - left
+      - right
+      - centre
+      - up
+      - down
+      - edge
+
+  - name: Body Parts
+    words:
+      - head
+      - stomach
+      - back
+      - arms
+      - legs
+      - rump
+      - tail
+      - core
+      - fingers
+      - horns
+
+  - name: Affinities
+    words:
+      - physical
+      - magical
+      - magic
+      - fire
+      - lightning
+      - wind
+      - ice
+      - earth
+      - water
+      - unaspected
+      - poison
+      - bleed
+      - death
+
+  - name: Concepts
+    words:
+      - life
+      - death
+      - aether
+      - astral
+      - umbral
+      - calamity
+      - light
+      - darkness
+      - devastation
+      - fear
+      - despair
+      - joy
+      - bliss
+      - good luck
+      - bad luck
+      - secret
+      - faith
+      - loyalty
+
+  - name: Phrases
+    words:
+      - this was not my intention
+      - seems familiar...