diff --git a/etk/stdTools.cpp b/etk/stdTools.cpp
index 6c527a5..4949e32 100644
--- a/etk/stdTools.cpp
+++ b/etk/stdTools.cpp
@@ -503,48 +503,18 @@ struct doublette {
 struct doublette convertionTable[] = {
 	{U'ç', U'Ç'},
 
-	{U'á', U'Á'},
-	{U'à', U'À'},
-	{U'ä', U'Ä'},
-	{U'â', U'Ä'},
-	{U'å', U'Å'},
-	{U'ã', U'Ã'},
+	{U'á', U'Á'}, {U'à', U'À'}, {U'ä', U'Ä'}, {U'â', U'Â'}, {U'å', U'Å'}, {U'ã', U'Ã'},
+	{U'é', U'É'}, {U'è', U'È'}, {U'ë', U'Ë'}, {U'ê', U'Ê'}, 
+	{U'ú', U'Ú'}, {U'ù', U'Ù'}, {U'ü', U'Ü'}, {U'û', U'Û'},
+	{U'í', U'Í'}, {U'ì', U'Ì'}, {U'ï', U'Ï'}, {U'î', U'Î'},
+	{U'ó', U'Ó'}, {U'ò', U'Ò'}, {U'ö', U'Ö'}, {U'ô', U'Ô'}, {U'õ', U'Õ'},
+	{U'ý', U'Ý'}, {U'ỳ', U'Ỳ'}, {U'ÿ', U'Ÿ'}, {U'ŷ', U'Ŷ'},
 
-	{U'é', U'É'},
-	{U'è', U'È'},
-	{U'ë', U'Ë'},
-	{U'ê', U'Ê'},
+	{U'ñ', U'Ñ'}, {U'ǹ', U'Ǹ'},
 
-	{U'ú', U'Ú'},
-	{U'ù', U'Ù'},
-	{U'ü', U'Ü'},
-	{U'û', U'Û'},
+	{U'ḧ', U'Ḧ'}, {U'ĥ', U'Ĥ'},
 
-	{U'í', U'Í'},
-	{U'ì', U'Ì'},
-	{U'ï', U'Ï'},
-	{U'î', U'Î'},
-
-	{U'ó', U'Ó'},
-	{U'ò', U'Ò'},
-	{U'ö', U'Ö'},
-	{U'ô', U'Ô'},
-	{U'õ', U'Õ'},
-
-	{U'ý', U'Ý'},
-	{U'ỳ', U'Ỳ'},
-	{U'ÿ', U'Ÿ'},
-	{U'ŷ', U'Ŷ'},
-
-	{U'ñ', U'Ñ'},
-	{U'ǹ', U'Ǹ'},
-
-	{U'ḧ', U'Ḧ'},
-	{U'ĥ', U'Ĥ'},
-
-	{U'ẅ', U'Ẅ'},
-	{U'ŵ', U'Ŵ'},
-	{U'ẁ', U'Ẁ'},
+	{U'ẅ', U'Ẅ'}, {U'ŵ', U'Ŵ'}, {U'ẁ', U'Ẁ'},
 
 	{U'ẍ', U'Ẍ'},