diff --git a/Swords_&_Wizardry/sheet.json b/Swords_&_Wizardry/sheet.json
deleted file mode 100644
index e10b468435..0000000000
--- a/Swords_&_Wizardry/sheet.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-"html": "SWSheet.html",
-"css": "SWSheet.css",
-"authors": "Jacob Vann,Natha",
-"roll20userid": "1318,75857",
-"preview": "SWSheet.png",
-"instructions": "Character sheet for [Swords & Wizardry](https://www.froggodgames.com/swords-wizardry-0), in english and french. See the [Readme](https://github.com/Roll20/roll20-character-sheets/blob/master/Swords_%26_Wizardry/ReadMe.md) for more informations on automated calculations and rolls from the sheet."
-,"tipeee":"https://www.tipeee.com/natharoll20"
-}
diff --git a/Swords_&_Wizardry/ReadMe.md b/swords-and-wizardry/README.md
similarity index 63%
rename from Swords_&_Wizardry/ReadMe.md
rename to swords-and-wizardry/README.md
index a653595c21..9a81c236c4 100644
--- a/Swords_&_Wizardry/ReadMe.md
+++ b/swords-and-wizardry/README.md
@@ -1,28 +1,42 @@
# Swords & Wizardry
-Character sheet for Swords & Wizardry, in english and french.
-Initially created by Jacob Vann and overhauled by [Natha](https://github.com/NathaTerrien/roll20-wip/blob/master/README.md) (design, translation data, automated calcultations and rolls/roll template).
+Character sheet for Swords & Wizardry, in English and French.
-# Current version
-2.2, Screenshots: [english](SWSheet.png), [french](SWSheet_fr.png)
+## Authors
-The sheet and its automated calculations (modifiers etc.) are based on the Complete version of the rules.
-Every calculation can be overriden by manual input, if house rules are used. But modifying certain fields will fire again the associated automated calcultion. For example, modifying DEX will compute again the AC modifier, Total AC etc. and any custom value previously entered has to be set again.
+* [Natha](https://github.com/NathaTerrien/roll20-wip/blob/master/README.md) (technical overhaul)
+* Jacob Vann (initial author)
-# Release notes
+## Current version
-## v2.2 (2017-09-17)
+Screenshots:
+
+* [English](SWSheet.png)
+* [French](SWSheet_fr.png)
+
+The sheet and its automated calculations (modifiers, etc.) are based on Swords & Wizardry Complete Rules.
+
+Every calculation can be overridden by manual input, if house rules are used. Modifying certain fields will trigger the associated automated calculation. For example, modifying DEX will trigger the AC modifier to be calculated, the total AC, etc. Then any custom value previously entered has to be set again.
+
+## Release notes
+
+### v2.3 (2020-04-21)
+
+* Fixed broken image link due to ampersand by moving this sheet to "swords-and-wizardry".
+* Cleaned up documentation fixing typos and adding minor copy edits.
+
+### v2.2 (2017-09-17)
* Technical optimisation
-## v2.1 (2017-02-15)
+### v2.1 (2017-02-15)
* Layout bug fix: Min/Max spell label was too long, and the corresponding field was hidden
* New 'Total Weight' field (automatically calculated based on total treasure and gear weights, but can be overriden)
* Treasure and Gear total weights calculation optimisation
* Relocate logo from imgur to github
-## v2.0 (2017-02-04)
+### v2.0 (2017-02-04)
Note : this new version of the sheet is compatible with previous versions and characters.
@@ -33,9 +47,9 @@ Note : this new version of the sheet is compatible with previous versions and ch
* New "Other" AC modifier to note magic items effect on AC, like rings or curses, wounds, spell effects etc.
* Handling of Ascending and Descending AC (radio button). On change:
* Base AC is (re)set accordingly
- * DEX modifier to AC is calculted accordingly
+ * DEX modifier to AC is calculated accordingly
* Ascending AC is calculated by adding Base AC + DEX modifier + absolute value of Armor AC modifier + absolute value of Shield AC modifier + Other AC modifier
- * Descending AC is calculted by adding Base AC + DEX modifier - absolute value of Armor AC modifier - absolute value of Shield AC modifier + Other AC modifier
+ * Descending AC is calculated by adding Base AC + DEX modifier - absolute value of Armor AC modifier - absolute value of Shield AC modifier + Other AC modifier
* Gear and Treasure weight are automatically tallied.
* Total gear weight sums every item weight, multiplied by quantity (unit weight assumed)
* Total Treasure weight sums every item weight
diff --git a/Swords_&_Wizardry/SWSheet.css b/swords-and-wizardry/SWSheet.css
similarity index 100%
rename from Swords_&_Wizardry/SWSheet.css
rename to swords-and-wizardry/SWSheet.css
diff --git a/Swords_&_Wizardry/SWSheet.html b/swords-and-wizardry/SWSheet.html
similarity index 99%
rename from Swords_&_Wizardry/SWSheet.html
rename to swords-and-wizardry/SWSheet.html
index 1d0cdc3bac..ec2b8ec719 100644
--- a/Swords_&_Wizardry/SWSheet.html
+++ b/swords-and-wizardry/SWSheet.html
@@ -410,7 +410,7 @@
-

+
Languages
diff --git a/Swords_&_Wizardry/SWSheet.png b/swords-and-wizardry/SWSheet.png
similarity index 100%
rename from Swords_&_Wizardry/SWSheet.png
rename to swords-and-wizardry/SWSheet.png
diff --git a/Swords_&_Wizardry/SWSheet_fr.png b/swords-and-wizardry/SWSheet_fr.png
similarity index 100%
rename from Swords_&_Wizardry/SWSheet_fr.png
rename to swords-and-wizardry/SWSheet_fr.png
diff --git a/Swords_&_Wizardry/SWSheet_logo.gif b/swords-and-wizardry/SWSheet_logo.gif
similarity index 100%
rename from Swords_&_Wizardry/SWSheet_logo.gif
rename to swords-and-wizardry/SWSheet_logo.gif
diff --git a/swords-and-wizardry/sheet.json b/swords-and-wizardry/sheet.json
new file mode 100644
index 0000000000..1447a7fb14
--- /dev/null
+++ b/swords-and-wizardry/sheet.json
@@ -0,0 +1,9 @@
+{
+"html": "SWSheet.html",
+"css": "SWSheet.css",
+"authors": "Jacob Vann,Natha",
+"roll20userid": "1318,75857",
+"preview": "SWSheet.png",
+"instructions": "Character sheet for Swords & Wizardry, in English and French. See the [README](https://github.com/Roll20/roll20-character-sheets/blob/master/swords-and-wizardry/README.md) for more informations on automated calculations and rolls from the sheet.",
+"tipeee":"https://www.tipeee.com/natharoll20"
+}
diff --git a/Swords_&_Wizardry/translation.json b/swords-and-wizardry/translation.json
similarity index 100%
rename from Swords_&_Wizardry/translation.json
rename to swords-and-wizardry/translation.json
diff --git a/Swords_&_Wizardry/translations/af.json b/swords-and-wizardry/translations/af.json
similarity index 100%
rename from Swords_&_Wizardry/translations/af.json
rename to swords-and-wizardry/translations/af.json
diff --git a/Swords_&_Wizardry/translations/cs.json b/swords-and-wizardry/translations/cs.json
similarity index 100%
rename from Swords_&_Wizardry/translations/cs.json
rename to swords-and-wizardry/translations/cs.json
diff --git a/Swords_&_Wizardry/translations/da.json b/swords-and-wizardry/translations/da.json
similarity index 100%
rename from Swords_&_Wizardry/translations/da.json
rename to swords-and-wizardry/translations/da.json
diff --git a/Swords_&_Wizardry/translations/de.json b/swords-and-wizardry/translations/de.json
similarity index 100%
rename from Swords_&_Wizardry/translations/de.json
rename to swords-and-wizardry/translations/de.json
diff --git a/Swords_&_Wizardry/translations/el.json b/swords-and-wizardry/translations/el.json
similarity index 100%
rename from Swords_&_Wizardry/translations/el.json
rename to swords-and-wizardry/translations/el.json
diff --git a/Swords_&_Wizardry/translations/en.json b/swords-and-wizardry/translations/en.json
similarity index 100%
rename from Swords_&_Wizardry/translations/en.json
rename to swords-and-wizardry/translations/en.json
diff --git a/Swords_&_Wizardry/translations/es.json b/swords-and-wizardry/translations/es.json
similarity index 100%
rename from Swords_&_Wizardry/translations/es.json
rename to swords-and-wizardry/translations/es.json
diff --git a/Swords_&_Wizardry/translations/fr.json b/swords-and-wizardry/translations/fr.json
similarity index 100%
rename from Swords_&_Wizardry/translations/fr.json
rename to swords-and-wizardry/translations/fr.json
diff --git a/Swords_&_Wizardry/translations/he.json b/swords-and-wizardry/translations/he.json
similarity index 100%
rename from Swords_&_Wizardry/translations/he.json
rename to swords-and-wizardry/translations/he.json
diff --git a/Swords_&_Wizardry/translations/it.json b/swords-and-wizardry/translations/it.json
similarity index 100%
rename from Swords_&_Wizardry/translations/it.json
rename to swords-and-wizardry/translations/it.json
diff --git a/Swords_&_Wizardry/translations/ja.json b/swords-and-wizardry/translations/ja.json
similarity index 100%
rename from Swords_&_Wizardry/translations/ja.json
rename to swords-and-wizardry/translations/ja.json
diff --git a/Swords_&_Wizardry/translations/ko.json b/swords-and-wizardry/translations/ko.json
similarity index 100%
rename from Swords_&_Wizardry/translations/ko.json
rename to swords-and-wizardry/translations/ko.json
diff --git a/Swords_&_Wizardry/translations/nl.json b/swords-and-wizardry/translations/nl.json
similarity index 100%
rename from Swords_&_Wizardry/translations/nl.json
rename to swords-and-wizardry/translations/nl.json
diff --git a/Swords_&_Wizardry/translations/pl.json b/swords-and-wizardry/translations/pl.json
similarity index 100%
rename from Swords_&_Wizardry/translations/pl.json
rename to swords-and-wizardry/translations/pl.json
diff --git a/Swords_&_Wizardry/translations/pt.json b/swords-and-wizardry/translations/pt.json
similarity index 100%
rename from Swords_&_Wizardry/translations/pt.json
rename to swords-and-wizardry/translations/pt.json
diff --git a/Swords_&_Wizardry/translations/ru.json b/swords-and-wizardry/translations/ru.json
similarity index 100%
rename from Swords_&_Wizardry/translations/ru.json
rename to swords-and-wizardry/translations/ru.json
diff --git a/Swords_&_Wizardry/translations/sv.json b/swords-and-wizardry/translations/sv.json
similarity index 100%
rename from Swords_&_Wizardry/translations/sv.json
rename to swords-and-wizardry/translations/sv.json
diff --git a/Swords_&_Wizardry/translations/tr.json b/swords-and-wizardry/translations/tr.json
similarity index 100%
rename from Swords_&_Wizardry/translations/tr.json
rename to swords-and-wizardry/translations/tr.json
diff --git a/Swords_&_Wizardry/translations/zh.json b/swords-and-wizardry/translations/zh.json
similarity index 100%
rename from Swords_&_Wizardry/translations/zh.json
rename to swords-and-wizardry/translations/zh.json
diff --git a/Swords_&_Wizardry/translations/zu.json b/swords-and-wizardry/translations/zu.json
similarity index 100%
rename from Swords_&_Wizardry/translations/zu.json
rename to swords-and-wizardry/translations/zu.json