diff --git a/FuturePlans.md b/FuturePlans.md
index ede32279f..a1a7384dc 100644
--- a/FuturePlans.md
+++ b/FuturePlans.md
@@ -32,8 +32,11 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - Clap
   - The Finger
   - Thumbs Down
-  - Horns
   - Giggle
+  - Heart
+  - Shrug
+  - Beckon
+  - Facepalm
 * **DLC Gameset:**
   - Tetris
   - Pong
@@ -52,7 +55,9 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - Kirin
 * **Japanese localization???**
 * **Monster/decoration replacements add-on**
-* **Photo Mode**
+* **Photo Mode** 
+  - Dedicated poses
+  - Stickers
 * **Hardcore Mode side mod**
   - Featuring Demolitionist on Maidbot frame
   - More complex game mechanics
diff --git a/graphics/Achievements/AchievementBune.png b/graphics/Achievements/AchievementBune.png
new file mode 100644
index 000000000..9e21d2b40
Binary files /dev/null and b/graphics/Achievements/AchievementBune.png differ
diff --git a/graphics/Achievements/AchievementCheat.png b/graphics/Achievements/AchievementCheat.png
new file mode 100644
index 000000000..a15dbc88d
Binary files /dev/null and b/graphics/Achievements/AchievementCheat.png differ
diff --git a/graphics/Achievements/AchievementDime.png b/graphics/Achievements/AchievementDime.png
new file mode 100644
index 000000000..be08e939d
Binary files /dev/null and b/graphics/Achievements/AchievementDime.png differ
diff --git a/graphics/Achievements/AchievementEverything.png b/graphics/Achievements/AchievementEverything.png
new file mode 100644
index 000000000..36fe8035b
Binary files /dev/null and b/graphics/Achievements/AchievementEverything.png differ
diff --git a/graphics/Achievements/AchievementFuel.png b/graphics/Achievements/AchievementFuel.png
new file mode 100644
index 000000000..2d586b876
Binary files /dev/null and b/graphics/Achievements/AchievementFuel.png differ
diff --git a/graphics/Achievements/AchievementGolden.png b/graphics/Achievements/AchievementGolden.png
new file mode 100644
index 000000000..77c15e146
Binary files /dev/null and b/graphics/Achievements/AchievementGolden.png differ
diff --git a/graphics/Achievements/AchievementPar.png b/graphics/Achievements/AchievementPar.png
new file mode 100644
index 000000000..f2ef808e8
Binary files /dev/null and b/graphics/Achievements/AchievementPar.png differ
diff --git a/graphics/Achievements/AchievementPlush.png b/graphics/Achievements/AchievementPlush.png
index a35932f0a..bedb29d43 100644
Binary files a/graphics/Achievements/AchievementPlush.png and b/graphics/Achievements/AchievementPlush.png differ
diff --git a/graphics/Achievements/AchievementStep.png b/graphics/Achievements/AchievementStep.png
new file mode 100644
index 000000000..3ee572cca
Binary files /dev/null and b/graphics/Achievements/AchievementStep.png differ
diff --git a/graphics/Achievements/AchievementYEET.png b/graphics/Achievements/AchievementYEET.png
new file mode 100644
index 000000000..668ef0bc6
Binary files /dev/null and b/graphics/Achievements/AchievementYEET.png differ
diff --git a/graphics/Achievements/todo.txt b/graphics/Achievements/todo.txt
index 45d0d8acd..0f5f52c90 100644
--- a/graphics/Achievements/todo.txt
+++ b/graphics/Achievements/todo.txt
@@ -6,20 +6,14 @@ balls
 bonk
 bossdash
 brake
-bune
 butts
-cheat
 clonk
 conga
-dime
 dosh
-everything
 ezkill
 flight
 friend
-fuel
 gib
-golden
 jump
 lead
 ligma
@@ -27,16 +21,14 @@ mega
 oneguy
 onestanding
 oopsie
-par
 parry
 reflect
+shame
 shock
 sneeze
-step
 stomp
 tele
 thicc
 thruwall
 wantdie
 wave
-yeet
diff --git a/language.def_base b/language.def_base
index 8609d0337..345d34862 100644
--- a/language.def_base
+++ b/language.def_base
@@ -927,7 +927,7 @@ SWWM_ACHIEVEMENT_NICE_TAG = "NICE";
 SWWM_ACHIEVEMENT_NICE_TXT = "Finish a level with 69 health";
 SWWM_ACHIEVEMENT_ONEGUY_TAG = "Fuck that Guy in Particular";
 SWWM_ACHIEVEMENT_ONEGUY_TXT = "Use the Ynykron Artifact to kill a single non-boss enemy";
-SWWM_ACHIEVEMENT_ONESTANDING_TAG = "A Warning to the Others";
+SWWM_ACHIEVEMENT_ONESTANDING_TAG = "Live to Tell the Tale";
 SWWM_ACHIEVEMENT_ONESTANDING_TXT = "Finish a map with just one enemy left alive";
 SWWM_ACHIEVEMENT_OOPSIE_TAG = "Big Oopsie";
 SWWM_ACHIEVEMENT_OOPSIE_TXT = "Erase yourself with the Ynykron Artifact";
diff --git a/language.es_base b/language.es_base
index feeadc109..16ec7c001 100644
--- a/language.es_base
+++ b/language.es_base
@@ -826,7 +826,7 @@ SWWM_ACHIEVEMENT_MOTH_TXT = "Reúne %d polillas";
 SWWM_ACHIEVEMENT_NICE_TXT = "Termina un nivel con 69 de vida";
 SWWM_ACHIEVEMENT_ONEGUY_TAG = "A la Mierda el Tío Ese";
 SWWM_ACHIEVEMENT_ONEGUY_TXT = "Usa el Artefacto Ynykron para matar a un único enemigo no-jefe";
-SWWM_ACHIEVEMENT_ONESTANDING_TAG = "Una Advertencia a los Otros";
+SWWM_ACHIEVEMENT_ONESTANDING_TAG = "Vive para Contar la Historia";
 SWWM_ACHIEVEMENT_ONESTANDING_TXT = "Termina un mapa con solo un enemigo vivo";
 SWWM_ACHIEVEMENT_OOPSIE_TAG = "Gran Errorcito";
 SWWM_ACHIEVEMENT_OOPSIE_TXT = "Bórrate con el Artefacto Ynykron";
diff --git a/language.version b/language.version
index 71e3bbe3e..32d0e2741 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r421 \cu(Mon 29 Mar 19:07:02 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r421 \cu(2021-03-29 19:07:02)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r421 \cu(Tue 30 Mar 19:04:11 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r421 \cu(2021-03-30 19:04:11)\c-";