diff --git a/_data/old_sitemap.yml b/_data/old_sitemap.yml
index 0bd26689..c40a59ca 100644
--- a/_data/old_sitemap.yml
+++ b/_data/old_sitemap.yml
@@ -1,6 +1,6 @@
 - page: /toki-pona/lesson-1/
   rewrite_rule: true
-  redirect_url: /toki-pona/o-kama-pona
+  redirect_url: /toki-pona/kama-pona
 - page: /toki-pona/lesson-2/
   rewrite_rule: true
   redirect_url: /toki-pona/syllables-1
diff --git a/_pages/toki-pona/dictionaries/glyphs.md b/_pages/toki-pona/dictionaries/glyphs.md
index 5ca4642b..b108aa52 100644
--- a/_pages/toki-pona/dictionaries/glyphs.md
+++ b/_pages/toki-pona/dictionaries/glyphs.md
@@ -251,7 +251,7 @@ supplimental_definitions:
   text: kin
 - image: "/images/t47_tokipona/nimi/t47_nimi_kipisi.jpg"
   text: kipisi
-- image: "/images/t47_tokipona/nimi/t47_nimi_mama.jpg"
+- image: "/images/t47_tokipona/nimi/t47_nimi_mama_old.jpg"
   text: mama (old)
 - image: "/images/t47_tokipona/nimi/t47_nimi_namako.jpg"
   text: namako
diff --git a/_pages/toki-pona/lesson-01-welcome.md b/_pages/toki-pona/lesson-01-welcome.md
index a830656c..bc9f5624 100644
--- a/_pages/toki-pona/lesson-01-welcome.md
+++ b/_pages/toki-pona/lesson-01-welcome.md
@@ -1,8 +1,8 @@
 ---
 layout: page
-title: Welcome - o kama pona
+title: Welcome - kama pona
 sitelen_lessons_index: 0
-permalink: /toki-pona/o-kama-pona
+permalink: /toki-pona/kama-pona
 
 url_next: /toki-pona/syllables-1
 ---
diff --git a/_pages/toki-pona/lesson-02-syllables.md b/_pages/toki-pona/lesson-02-syllables.md
index ad3424d4..3c359bd1 100644
--- a/_pages/toki-pona/lesson-02-syllables.md
+++ b/_pages/toki-pona/lesson-02-syllables.md
@@ -4,7 +4,7 @@ title: Syllables Part 1
 sitelen_lessons_index: 1
 permalink: /toki-pona/syllables-1
 
-url_previous: /toki-pona/o-kama-pona
+url_previous: /toki-pona/kama-pona
 url_next: /toki-pona/syllables-2
 
 consonant_definitions:
diff --git a/_pages/toki-pona/lesson-02a-syllables-2.md b/_pages/toki-pona/lesson-02a-syllables-2.md
index 6a6819e3..ed570954 100644
--- a/_pages/toki-pona/lesson-02a-syllables-2.md
+++ b/_pages/toki-pona/lesson-02a-syllables-2.md
@@ -48,13 +48,45 @@ syllable_words:
   text: sin
 - image: /images/t47_tokipona/kalalili/t47_kalalili_tan.jpg
   text: tan
+capsule_words:
+- image: /images/t47_tokipona/kamasona/syllables/nimilon.jpg
+  text: "nimi 'lon'"
+- image: /images/t47_tokipona/kamasona/syllables/nimisewi.jpg
+  text: "nimi 'sewi'"
+syllable_names:
+- image: /images/t47_tokipona/kamasona/syllables/sonja_tall.jpg
+  text: sonja
+- image: /images/t47_tokipona/kamasona/syllables/tosi.jpg
+  text: tosi
+- image: /images/t47_tokipona/kamasona/syllables/apolo.jpg
+  text: apolo
+- image: /images/t47_tokipona/kamasona/syllables/kowala.jpg
+  text: kowala
+cartouche_names:
+- image: /images/t47_tokipona/kamasona/syllables/csonja_tall.jpg
+  text: Sonja
+- image: /images/t47_tokipona/kamasona/syllables/ctosi.jpg
+  text: Tosi
+- image: /images/t47_tokipona/kamasona/syllables/capolo.jpg
+  text: Apolo
+- image: /images/t47_tokipona/kamasona/syllables/ckowala.jpg
+  text: Kowala
+head_names:
+- image: /images/t47_tokipona/kamasona/syllables/jansonja_tall.jpg
+  text: jan Sonja
+- image: /images/t47_tokipona/kamasona/syllables/matosi.jpg
+  text: ma Tosi
+- image: /images/t47_tokipona/kamasona/syllables/sewiapolo.jpg
+  text: sewi Apolo
+- image: /images/t47_tokipona/kamasona/syllables/sowelikowala.jpg
+  text: soweli Kowala
 toki_pona_tests:
 - image: /images/t47_tokipona/kamasona/syllables/mipona.jpg
   text: mi pona
 - image: /images/t47_tokipona/kamasona/syllables/niminimi.jpg
-  text: nimi 'nimi' - (the word 'nimi')
-- image: /images/t47_tokipona/kamasona/syllables/janote.jpg
-  text: jan Ote
+  text: nimi 'nimi'
+- image: /images/t47_tokipona/kamasona/syllables/janjosan.jpg
+  text: jan Josan
 ---
 
 {% include image_dictionary.html definitions=page.vocabulary %}
@@ -90,42 +122,30 @@ It comes in most handy if you ever want to use a toki pona words outside of pu,
 
 It is also useful if you want to talk _about_ a word. In toki pona we might put the word in quotes or italics: _mi toki e nimi 'lon'_. Here we can use the capsule with _nimi_ to emphasize that we are talking about the word:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/nimilon.jpg" caption="nimi 'lon'" %}
-
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/nimisewi.jpg" caption="nimi 'sewi'" %}
+{% include image_dictionary.html definitions=page.capsule_words %}
 
 ### unofficial words with a head noun
 
 The most common use of syllables is when we need to create unofficial loan words and proper names.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/sonja.jpg" caption="sonja" %}
-
-tosi
-apolo
-kowala
+{% include image_dictionary.html definitions=page.syllable_names %}
 
 #### cartouche
 
 toki pona uses capital letters to distinguish these foreign words, here we infix the glyphs in a cartouche. It is similar to the capsule above, but it used for foreign words only.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/c_sonja.jpg" caption="Sonja" %}
-
-Tosi
-Apolo
-Kowala
+{% include image_dictionary.html definitions=page.cartouche_names %}
 
 #### head noun
 
 Since all unofficial words need to modify a noun, this will often rest on top of the cartouche.
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/syllables/jansonja.jpg" caption="jan Sonja" %}
-
-ma Tosi
-sewi Apolo
-soweli Kowala
+{% include image_dictionary.html definitions=page.head_names %}
 
 ### test your comprehension
 
 #### translate into toki pona (hover or tab through to reveal the answer)
 
 {% include image_dictionary.html definitions=page.toki_pona_tests reveal_text='true' %}
+
+That last one is my toki pona name, if you are looking for me on any social sites.
diff --git a/_pages/toki-pona/lesson-03-basic-sentences.md b/_pages/toki-pona/lesson-03-basic-sentences.md
index 6445c524..93714b75 100644
--- a/_pages/toki-pona/lesson-03-basic-sentences.md
+++ b/_pages/toki-pona/lesson-03-basic-sentences.md
@@ -35,8 +35,8 @@ vocabulary:
 - image: "/images/t47_tokipona/nimi/t47_nmpi_exclamation2.jpg"
   text: exclamation
 toki_pona_tests:
-- image: /images/t47_tokipona/kamasona/basic/onlipona.jpg
-  text: ona li pona.
+- image: /images/t47_tokipona/kamasona/basic/onalipona.jpg
+  text: ona li pona!
 - image: /images/t47_tokipona/kamasona/basic/nilisuli.jpg
   text: ni li suli.
 - image: /images/t47_tokipona/kamasona/basic/janlimoku.jpg
diff --git a/_pages/toki-pona/lesson-04-direct-objects.md b/_pages/toki-pona/lesson-04-direct-objects.md
index d8ab5a52..14fba298 100644
--- a/_pages/toki-pona/lesson-04-direct-objects.md
+++ b/_pages/toki-pona/lesson-04-direct-objects.md
@@ -33,13 +33,13 @@ vocabulary_row_2:
   text: sitelen
 toki_pona_tests:
 - image: /images/t47_tokipona/kamasona/direct_objects/misoneijo.jpg
-  text: mi sona e ijo. - I know the thing, I know something
+  text: mi sona e ijo.
 - image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: telo li suli li pona. - Water is important and good.
+  text: telo li suli li pona.
 - image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: sewi li pana e sona. - The gods gives knowledge.
+  text: sewi li pana e sona.
 - image: /images/t47_tokipona/kamasona/direct_objects/x.jpg
-  text: ma li jo e telo e suno. - The land has water and sunshine.
+  text: ma li jo e telo e suno.
 english_tests:
 - image: /images/t47_tokipona/kamasona/direct_objects/misoneijo.jpg
   text: I know the thing, I know something
@@ -122,8 +122,6 @@ Now that our sentences are getting longer, we’ve started to talk about block s
 
 ### test your comprehension
 
-### test your comprehension
-
 #### translate into toki pona (hover or tab through to reveal the answer):
 
 {% include image_dictionary.html definitions=page.toki_pona_tests reveal_text='true' %}
diff --git a/_pages/toki-pona/lesson-12-syllables-3.md b/_pages/toki-pona/lesson-12-syllables-3.md
index 591f68dc..3b87c732 100644
--- a/_pages/toki-pona/lesson-12-syllables-3.md
+++ b/_pages/toki-pona/lesson-12-syllables-3.md
@@ -6,26 +6,64 @@ permalink: /toki-pona/syllables-3
 
 url_previous: /toki-pona/la
 # url_next: /toki-pona/conjunctions
+
+syllable_names:
+- image: /images/t47_tokipona/kamasona/syllables/sonja.jpg
+  text: sonja
+- image: /images/t47_tokipona/kamasona/syllables/akanisa.jpg
+  text: akanisa
+- image: /images/t47_tokipona/kamasona/syllables/intenasijonale.jpg
+  text: intenasijonale
+- image: /images/t47_tokipona/kamasona/syllables/nujoka.jpg
+  text: nujoka
+cartouche_names:
+- image: /images/t47_tokipona/kamasona/syllables/csonja.jpg
+  text: Sonja
+- image: /images/t47_tokipona/kamasona/syllables/cakanisa.jpg
+  text: Akanisa
+- image: /images/t47_tokipona/kamasona/syllables/cintenasijonale.jpg
+  text: Intenasijonale
+- image: /images/t47_tokipona/kamasona/syllables/cnujoka.jpg
+  text: Nujoka
+head_names:
+- image: /images/t47_tokipona/kamasona/syllables/jansonja.jpg
+  text: jan Sonja
+- image: /images/t47_tokipona/kamasona/syllables/maakanisa.jpg
+  text: ma Akanisa
+- image: /images/t47_tokipona/kamasona/syllables/tokisuliintenasijonale.jpg
+  text: toki suli Intenasijonale
+- image: /images/t47_tokipona/kamasona/syllables/matomonujoka.jpg
+  text: ma tomo Nujoka
+jan_cartouche:
+- image: /images/t47_tokipona/kamasona/syllables/jcansonja.jpg
+  text: jan Sonja
+- image: /images/t47_tokipona/kamasona/syllables/jcanote.jpg
+  text: jan Ote
+- image: /images/t47_tokipona/kamasona/syllables/jcantoni.jpg
+  text: jan Toni
 ---
 
 ### unofficial words
 
-In [Combining Syllables](/toki-pona/syllables-2) we learned how to write out the syllable glyphs. Take a look at this lesson again is you need a refresher.  These are the glyphs we use to spell out unofficial words that have been "tokiponized".
+Right at the beginning of the course in Syllables [part 1](/toki-pona/syllables-1) and [part 2](/toki-pona/syllables-2) we learned how to write out the syllable glyphs. Take a look at this lesson again is you need a refresher.
+
+Now that we know more about block order, let's review proper names with longer syllable strings:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_02.jpg" caption="akanisa" %}
+{% include image_dictionary.html definitions=page.syllable_names %}
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_04.jpg" caption="intenasijonale" %}
+infixed in a cartouche:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_03.jpg" caption="nujoka" %}
+{% include image_dictionary.html definitions=page.cartouche_names %}
 
-They are infixed in a cartouche with a head noun:
+and complete with a head noun:
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_10.jpg" caption="ma Akanisa" %}
+{% include image_dictionary.html definitions=page.head_names %}
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_12.jpg" caption="toki suli Intenasijonale" %}
+#### jan as a container
 
-{% include image_and_caption.html image="/images/t47_tokipona/kamasona/t47_kaso09_11.jpg" caption="ma tomo Nujoka" %}
+By far the most common head noun is _jan_, as everyone's proper name is presented this way.  Luckily we have one simplification available to us, as _jan_ can combine with the cartouche and act as a container in itself:
 
+{% include image_dictionary.html definitions=page.jan_cartouche %}
 
 ### organizing syllable glyphs
 
diff --git a/images/t47_tokipona/kamasona/basic/janlimoku.jpg b/images/t47_tokipona/kamasona/basic/janlimoku.jpg
new file mode 100644
index 00000000..75505987
Binary files /dev/null and b/images/t47_tokipona/kamasona/basic/janlimoku.jpg differ
diff --git a/images/t47_tokipona/kamasona/basic/nilisuli.jpg b/images/t47_tokipona/kamasona/basic/nilisuli.jpg
new file mode 100644
index 00000000..120c4ef6
Binary files /dev/null and b/images/t47_tokipona/kamasona/basic/nilisuli.jpg differ
diff --git a/images/t47_tokipona/kamasona/basic/onalipona.jpg b/images/t47_tokipona/kamasona/basic/onalipona.jpg
new file mode 100644
index 00000000..c9418688
Binary files /dev/null and b/images/t47_tokipona/kamasona/basic/onalipona.jpg differ
diff --git a/images/t47_tokipona/kamasona/basic/sinatoki.jpg b/images/t47_tokipona/kamasona/basic/sinatoki.jpg
new file mode 100644
index 00000000..7a196c4c
Binary files /dev/null and b/images/t47_tokipona/kamasona/basic/sinatoki.jpg differ
diff --git a/images/t47_tokipona/kamasona/basic_sentences/janlimoku.jpg b/images/t47_tokipona/kamasona/basic_sentences/janlimoku.jpg
deleted file mode 100644
index d847ce25..00000000
Binary files a/images/t47_tokipona/kamasona/basic_sentences/janlimoku.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/basic_sentences/nilisuli.jpg b/images/t47_tokipona/kamasona/basic_sentences/nilisuli.jpg
deleted file mode 100644
index 71e9a1ea..00000000
Binary files a/images/t47_tokipona/kamasona/basic_sentences/nilisuli.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/basic_sentences/onalipona_1.jpg b/images/t47_tokipona/kamasona/basic_sentences/onalipona_1.jpg
deleted file mode 100644
index 30fb74c4..00000000
Binary files a/images/t47_tokipona/kamasona/basic_sentences/onalipona_1.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/basic_sentences/onalipona_2.jpg b/images/t47_tokipona/kamasona/basic_sentences/onalipona_2.jpg
deleted file mode 100644
index 21bde394..00000000
Binary files a/images/t47_tokipona/kamasona/basic_sentences/onalipona_2.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/basic_sentences/sina_toki.jpg b/images/t47_tokipona/kamasona/basic_sentences/sina_toki.jpg
deleted file mode 100644
index f7ff972f..00000000
Binary files a/images/t47_tokipona/kamasona/basic_sentences/sina_toki.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_02.jpg b/images/t47_tokipona/kamasona/syllables/akanisa.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_02.jpg
rename to images/t47_tokipona/kamasona/syllables/akanisa.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/apolo.jpg b/images/t47_tokipona/kamasona/syllables/apolo.jpg
index 47aa12e9..91231bbb 100644
Binary files a/images/t47_tokipona/kamasona/syllables/apolo.jpg and b/images/t47_tokipona/kamasona/syllables/apolo.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/c_apolo.jpg b/images/t47_tokipona/kamasona/syllables/c_apolo.jpg
deleted file mode 100644
index 918eaf61..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/c_apolo.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/c_kowala.jpg b/images/t47_tokipona/kamasona/syllables/c_kowala.jpg
deleted file mode 100644
index e8d71714..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/c_kowala.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/c_tosi.jpg b/images/t47_tokipona/kamasona/syllables/c_tosi.jpg
deleted file mode 100644
index 20875235..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/c_tosi.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_06.jpg b/images/t47_tokipona/kamasona/syllables/cakanisa.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_06.jpg
rename to images/t47_tokipona/kamasona/syllables/cakanisa.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/capolo.jpg b/images/t47_tokipona/kamasona/syllables/capolo.jpg
new file mode 100644
index 00000000..0d108ddc
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/capolo.jpg differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_08.jpg b/images/t47_tokipona/kamasona/syllables/cintenasijonale.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_08.jpg
rename to images/t47_tokipona/kamasona/syllables/cintenasijonale.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/cjansonja.jpg b/images/t47_tokipona/kamasona/syllables/cjansonja.jpg
new file mode 100644
index 00000000..a9094574
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/cjansonja.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/ckowala.jpg b/images/t47_tokipona/kamasona/syllables/ckowala.jpg
new file mode 100644
index 00000000..0c651e40
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/ckowala.jpg differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_07.jpg b/images/t47_tokipona/kamasona/syllables/cnujoka.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_07.jpg
rename to images/t47_tokipona/kamasona/syllables/cnujoka.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/c_sonja.jpg b/images/t47_tokipona/kamasona/syllables/csonja.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/syllables/c_sonja.jpg
rename to images/t47_tokipona/kamasona/syllables/csonja.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/csonja_tall.jpg b/images/t47_tokipona/kamasona/syllables/csonja_tall.jpg
new file mode 100644
index 00000000..88fde843
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/csonja_tall.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/ctosi.jpg b/images/t47_tokipona/kamasona/syllables/ctosi.jpg
new file mode 100644
index 00000000..89c3e700
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/ctosi.jpg differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_04.jpg b/images/t47_tokipona/kamasona/syllables/intenasijonale.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_04.jpg
rename to images/t47_tokipona/kamasona/syllables/intenasijonale.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/jan_josan.jpg b/images/t47_tokipona/kamasona/syllables/jan_josan.jpg
deleted file mode 100644
index c6da209b..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/jan_josan.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/janjosan.jpg b/images/t47_tokipona/kamasona/syllables/janjosan.jpg
new file mode 100644
index 00000000..34011f6b
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/janjosan.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/jansonja_tall.jpg b/images/t47_tokipona/kamasona/syllables/jansonja_tall.jpg
new file mode 100644
index 00000000..cedb0dfd
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/jansonja_tall.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/kowala.jpg b/images/t47_tokipona/kamasona/syllables/kowala.jpg
index 638384d9..7395eca0 100644
Binary files a/images/t47_tokipona/kamasona/syllables/kowala.jpg and b/images/t47_tokipona/kamasona/syllables/kowala.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/leko.jpg b/images/t47_tokipona/kamasona/syllables/leko.jpg
new file mode 100644
index 00000000..e31fc3ff
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/leko.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/ma_Tosi.jpg b/images/t47_tokipona/kamasona/syllables/ma_Tosi.jpg
deleted file mode 100644
index 5c3b87c3..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/ma_Tosi.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_10.jpg b/images/t47_tokipona/kamasona/syllables/maakanisa.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_10.jpg
rename to images/t47_tokipona/kamasona/syllables/maakanisa.jpg
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_11.jpg b/images/t47_tokipona/kamasona/syllables/matomonujoka.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_11.jpg
rename to images/t47_tokipona/kamasona/syllables/matomonujoka.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/matosi.jpg b/images/t47_tokipona/kamasona/syllables/matosi.jpg
new file mode 100644
index 00000000..688b5982
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/matosi.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/mi_pona.jpg b/images/t47_tokipona/kamasona/syllables/mi_pona.jpg
deleted file mode 100644
index cee45a51..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/mi_pona.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/mipona.jpg b/images/t47_tokipona/kamasona/syllables/mipona.jpg
new file mode 100644
index 00000000..bb630226
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/mipona.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/nimi_lon.jpg b/images/t47_tokipona/kamasona/syllables/nimi_lon.jpg
deleted file mode 100644
index 4032b9ab..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/nimi_lon.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/nimi_nimi.jpg b/images/t47_tokipona/kamasona/syllables/nimi_nimi.jpg
deleted file mode 100644
index 728ae419..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/nimi_nimi.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/nimilon.jpg b/images/t47_tokipona/kamasona/syllables/nimilon.jpg
new file mode 100644
index 00000000..eb6983da
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/nimilon.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/niminimi.jpg b/images/t47_tokipona/kamasona/syllables/niminimi.jpg
new file mode 100644
index 00000000..a95af105
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/niminimi.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/nimisewi.jpg b/images/t47_tokipona/kamasona/syllables/nimisewi.jpg
new file mode 100644
index 00000000..38778b00
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/nimisewi.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/nmpi_capsule.jpg b/images/t47_tokipona/kamasona/syllables/nmpi_capsule.jpg
new file mode 100644
index 00000000..347699d2
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/nmpi_capsule.jpg differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_03.jpg b/images/t47_tokipona/kamasona/syllables/nujoka.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_03.jpg
rename to images/t47_tokipona/kamasona/syllables/nujoka.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/sewi_Apolo.jpg b/images/t47_tokipona/kamasona/syllables/sewi_Apolo.jpg
deleted file mode 100644
index b4ef5619..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/sewi_Apolo.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/sewiapolo.jpg b/images/t47_tokipona/kamasona/syllables/sewiapolo.jpg
new file mode 100644
index 00000000..995f75af
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/sewiapolo.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/sonja_tall.jpg b/images/t47_tokipona/kamasona/syllables/sonja_tall.jpg
new file mode 100644
index 00000000..569bf1cf
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/sonja_tall.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/soweli_Koala.jpg b/images/t47_tokipona/kamasona/syllables/soweli_Koala.jpg
deleted file mode 100644
index 72074a5e..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/soweli_Koala.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/sowelikowala.jpg b/images/t47_tokipona/kamasona/syllables/sowelikowala.jpg
new file mode 100644
index 00000000..e20456fa
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/sowelikowala.jpg differ
diff --git a/images/t47_tokipona/kamasona/syllables/toki_pona.jpg b/images/t47_tokipona/kamasona/syllables/toki_pona.jpg
deleted file mode 100644
index e8cd44e7..00000000
Binary files a/images/t47_tokipona/kamasona/syllables/toki_pona.jpg and /dev/null differ
diff --git a/images/t47_tokipona/kamasona/syllables/tokipona.jpg b/images/t47_tokipona/kamasona/syllables/tokipona.jpg
new file mode 100644
index 00000000..b6500ed3
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/tokipona.jpg differ
diff --git a/images/t47_tokipona/kamasona/t47_kaso09_12.jpg b/images/t47_tokipona/kamasona/syllables/tokisuliintenasijonale.jpg
similarity index 100%
rename from images/t47_tokipona/kamasona/t47_kaso09_12.jpg
rename to images/t47_tokipona/kamasona/syllables/tokisuliintenasijonale.jpg
diff --git a/images/t47_tokipona/kamasona/syllables/tosi.jpg b/images/t47_tokipona/kamasona/syllables/tosi.jpg
new file mode 100644
index 00000000..73b6b50c
Binary files /dev/null and b/images/t47_tokipona/kamasona/syllables/tosi.jpg differ
diff --git a/images/t47_tokipona/nimi/t47_nimi_ken 2.jpg b/images/t47_tokipona/nimi/t47_nimi_ken 2.jpg
new file mode 100644
index 00000000..208e60a6
Binary files /dev/null and b/images/t47_tokipona/nimi/t47_nimi_ken 2.jpg differ
diff --git a/images/t47_tokipona/nimi/t47_nimi_ken.jpg b/images/t47_tokipona/nimi/t47_nimi_ken.jpg
index c7a10a48..208e60a6 100644
Binary files a/images/t47_tokipona/nimi/t47_nimi_ken.jpg and b/images/t47_tokipona/nimi/t47_nimi_ken.jpg differ
diff --git a/images/t47_tokipona/nimi/t47_nimi_ken_old.jpg b/images/t47_tokipona/nimi/t47_nimi_ken_old.jpg
new file mode 100644
index 00000000..c7a10a48
Binary files /dev/null and b/images/t47_tokipona/nimi/t47_nimi_ken_old.jpg differ
diff --git a/images/t47_tokipona/nimi/t47_nimi_mama.jpg b/images/t47_tokipona/nimi/t47_nimi_mama.jpg
index 2ae4a7ea..b58b6b2b 100644
Binary files a/images/t47_tokipona/nimi/t47_nimi_mama.jpg and b/images/t47_tokipona/nimi/t47_nimi_mama.jpg differ
diff --git a/images/t47_tokipona/nimi/t47_nimi_mama_old.jpg b/images/t47_tokipona/nimi/t47_nimi_mama_old.jpg
new file mode 100644
index 00000000..2ae4a7ea
Binary files /dev/null and b/images/t47_tokipona/nimi/t47_nimi_mama_old.jpg differ