diff --git a/resources/dictionaries/et/cross_streets.txt b/resources/dictionaries/et/cross_streets.txt
new file mode 100644
index 00000000..a2711eed
--- /dev/null
+++ b/resources/dictionaries/et/cross_streets.txt
@@ -0,0 +1,4 @@
+ja
+nurgal
+nurgas
+vahel
\ No newline at end of file
diff --git a/resources/dictionaries/et/directionals.txt b/resources/dictionaries/et/directionals.txt
index 96247649..f53e1850 100644
--- a/resources/dictionaries/et/directionals.txt
+++ b/resources/dictionaries/et/directionals.txt
@@ -2,7 +2,8 @@ edelasse
 ida
 kagu
 kirde
-lääs
+lääs|laas
 loe
-louna|l
-põhja|pohja|p
\ No newline at end of file
+lõuna|louna|l
+põhi|pohi|p
+põhja|pohja
\ No newline at end of file
diff --git a/resources/dictionaries/et/entrances.txt b/resources/dictionaries/et/entrances.txt
new file mode 100644
index 00000000..b2a6ecd0
--- /dev/null
+++ b/resources/dictionaries/et/entrances.txt
@@ -0,0 +1 @@
+sissepääs|sissepaas
\ No newline at end of file
diff --git a/resources/dictionaries/et/level_types_basement.txt b/resources/dictionaries/et/level_types_basement.txt
new file mode 100644
index 00000000..36905d4b
--- /dev/null
+++ b/resources/dictionaries/et/level_types_basement.txt
@@ -0,0 +1,2 @@
+kelder
+keldris
\ No newline at end of file
diff --git a/resources/dictionaries/et/level_types_numbered.txt b/resources/dictionaries/et/level_types_numbered.txt
new file mode 100644
index 00000000..4ca43e5d
--- /dev/null
+++ b/resources/dictionaries/et/level_types_numbered.txt
@@ -0,0 +1 @@
+korrusel
\ No newline at end of file
diff --git a/resources/dictionaries/et/near.txt b/resources/dictionaries/et/near.txt
new file mode 100644
index 00000000..eaaf8e20
--- /dev/null
+++ b/resources/dictionaries/et/near.txt
@@ -0,0 +1,4 @@
+lähedal|lahedal
+lähedal mulle|lahedal mulle
+siin lähedal|siin lahedal
+siinkandis
\ No newline at end of file
diff --git a/resources/dictionaries/et/number.txt b/resources/dictionaries/et/number.txt
index fcbf7b26..0298202c 100644
--- a/resources/dictionaries/et/number.txt
+++ b/resources/dictionaries/et/number.txt
@@ -1 +1 @@
-number|nr|no|#
\ No newline at end of file
+number|nr|no|#|nbr
\ No newline at end of file
diff --git a/resources/dictionaries/et/place_names.txt b/resources/dictionaries/et/place_names.txt
index 32227640..eb22404a 100644
--- a/resources/dictionaries/et/place_names.txt
+++ b/resources/dictionaries/et/place_names.txt
@@ -1,14 +1,39 @@
 akadeemia
+apteek
+baar
 farmaatsia|farm
+gümnaasium|gumnaasium
+haigla
 instituut|inst
 jaoskond|jsk
 keskkool|kk
+kalmistu
+keskkool
+kirik
+kiriku
+kool
 kooli
+kohvik
+kontserdipaik
+lasteaed
+lasteaia
+lossi
+majaka
 ministeerium|min
 observatoorium|obs
 organisatsioon|org
 osakond|osk
 pargi
+põhikool|pohikool
+postkontor
 raamatukogu|rmtk
 raamatukauplus|rmtkpl
-teatriala|teatr
\ No newline at end of file
+sild
+staadioni
+teater
+teatriala|teatr
+tehase
+torni
+turu
+ülikool|ulikool
+vabriku
\ No newline at end of file
diff --git a/resources/dictionaries/et/post_office.txt b/resources/dictionaries/et/post_office.txt
new file mode 100644
index 00000000..40652d76
--- /dev/null
+++ b/resources/dictionaries/et/post_office.txt
@@ -0,0 +1,2 @@
+abonementpostkast
+kast
\ No newline at end of file
diff --git a/resources/dictionaries/et/staircases.txt b/resources/dictionaries/et/staircases.txt
new file mode 100644
index 00000000..f1585e11
--- /dev/null
+++ b/resources/dictionaries/et/staircases.txt
@@ -0,0 +1 @@
+trepikoda
\ No newline at end of file
diff --git a/resources/dictionaries/et/street_types.txt b/resources/dictionaries/et/street_types.txt
index f2fbec53..e48c0da3 100644
--- a/resources/dictionaries/et/street_types.txt
+++ b/resources/dictionaries/et/street_types.txt
@@ -1,3 +1,4 @@
+allee
 esplanaadi
 maantee|mnt
 pargi
diff --git a/resources/dictionaries/et/unit_directions.txt b/resources/dictionaries/et/unit_directions.txt
new file mode 100644
index 00000000..bb641e1a
--- /dev/null
+++ b/resources/dictionaries/et/unit_directions.txt
@@ -0,0 +1,4 @@
+paremal
+paremale
+vasakul
+vasakule
\ No newline at end of file
diff --git a/resources/dictionaries/et/unit_types_numbered.txt b/resources/dictionaries/et/unit_types_numbered.txt
index 258c49cd..fbbe954b 100644
--- a/resources/dictionaries/et/unit_types_numbered.txt
+++ b/resources/dictionaries/et/unit_types_numbered.txt
@@ -1 +1,3 @@
-korter|k
\ No newline at end of file
+korter|k
+ruumi
+uks
\ No newline at end of file