diff --git a/CHANGELOG.html b/CHANGELOG.html
index 5a84283..c464419 100644
--- a/CHANGELOG.html
+++ b/CHANGELOG.html
@@ -1,20 +1,14 @@
 <h3>Features</h3>
 <ul>
-  <li>Improve Required Races customization.</li>
-  <ul>
-    <li>Items limited to all races of one faction can now be shown as requiring a faction instead.</li>
-    <li>It's now possible to hide only lines that list your race as a requirement.</li>
-  </ul>
-</ul>
-<h3>Changes</h3>
-<ul>
-  <li>Added item level overrides for some tokens in Cata.</li>
-  <li>Added heroic tags for tokens and some items in Cata.</li>
+  <li>Add Transmogrification customization.</li>
+  <li>Thousands separators are now used for most numbers (1000 -> 1,000). This is customizable.</li>
+  <li>&lt;Gifted From&gt; and &lt;Written By&gt; can now be individually customized, instead of being merged with &lt;Made By&gt;.</li>
 </ul>
 <h3>Fixes</h3>
 <ul>
-  <li>Fixed missing Heroic tags.</li>
-  <li>Fixed formatting on items that list Druid as a required class.</li>
-  <li>Filtering out useless race requirement lines now works correctly in Cata.</li>
-  <li>Fixed item level override on Reply-Code Alpha. It never got increased for the Ulduar item level bump.</li>
+  <li>Useless and faction-specific race restrictions should consistently be detected in Cata.</li>
+  <li>Restored School Spellpower in Cata. This was never meant to be removed.</li>
+  <li>Many fixes relating to numbers having thousands separators.</li>
+  <li>Transmog lines should appear in a consistent location between heroic and normal items.</li>
+  <li>Damage Per Second can now be correctly reworded with custom text.</li>
 </ul>
\ No newline at end of file
diff --git a/CHANGELOG_HISTORY.html b/CHANGELOG_HISTORY.html
index 128b742..5af925d 100644
--- a/CHANGELOG_HISTORY.html
+++ b/CHANGELOG_HISTORY.html
@@ -1,3 +1,21 @@
+<h1>2.18.0</h1>
+<h3>Features</h3>
+<ul>
+  <li>Add Transmogrification customization.</li>
+  <li>Thousands separators are now used for most numbers (1000 -> 1,000). This is customizable.</li>
+  <li>&lt;Gifted From&gt; and &lt;Written By&gt; can now be individually customized, instead of being merged with &lt;Made By&gt;.</li>
+</ul>
+<h3>Fixes</h3>
+<ul>
+  <li>Useless and faction-specific race restrictions should consistently be detected in Cata.</li>
+  <li>Restored School Spellpower in Cata. This was never meant to be removed.</li>
+  <li>Many fixes relating to numbers having thousands separators.</li>
+  <li>Transmog lines should appear in a consistent location between heroic and normal items.</li>
+  <li>Damage Per Second can now be correctly reworded with custom text.</li>
+</ul>
+
+
+<p>&nbsp;</p>
 <h1>2.17.0</h1>
 <h3>Features</h3>
 <ul>
diff --git a/ZeraTooltip.toc b/ZeraTooltip.toc
index f2a6833..9e8cf34 100644
--- a/ZeraTooltip.toc
+++ b/ZeraTooltip.toc
@@ -1,14 +1,13 @@
 ## Interface: 40400
 ## Interface-Cata: 40400
-## Interface-Wrath: 30403
 ## Interface-Classic: 11502
-## Version: 2.17.0
+## Version: 2.18.0
 
 ## X-Curse-Project-ID: 533049
 ## X-Wago-ID: Qb6mJ1KP
 
 ## Title: ZeraTooltip
-## Notes: Formats item tooltips.
+## Notes: Highly customizable item tooltip formatting.
 ## Author: Anonomit
 
 ## SavedVariables: ZeraTooltipDB