diff --git a/configure.ac.in b/configure.ac.in
index 2a91f8f94efef90db09f3eecfe2d4aadf53ad647..ebafb10fbdc1ae5b7eabc072d5a3857a7a020788 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -218,8 +218,8 @@ themes/default.keys/Makefile
 themes/default-4.0/Makefile
 themes/default-4.2/Makefile
 themes/katiola/Makefile
+themes/kokodi/Makefile
 themes/moheli/Makefile
-themes/mopti/Makefile
 themes/sassandra/Makefile
 themes/stoneage/Makefile
 themes/therapy/Makefile
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 713ec51f83aef3c473664bd9515e3942c24875f4..07bd5c1b5705c2161e5b1911ad5817b8a0323ddb 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -8,8 +8,8 @@ SUBDIRS =								\
 	default-4.0							\
 	default-4.2							\
 	katiola								\
+	kokodi								\
 	moheli								\
-	mopti								\
 	sassandra							\
 	stoneage							\
 	therapy								\
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index 7bfd7bcba61e6ec80e03a15ec5d93baae3da373e..2a57cb24f580a440391fd77e6acf4b67b309745c 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Mopti/xfwm4
+themedir = $(datadir)/themes/Default/xfwm4
 
 PNG_FILES = 								\
 	bottom-active.png						\
diff --git a/themes/kokodi/Makefile.am b/themes/kokodi/Makefile.am
index 2a57cb24f580a440391fd77e6acf4b67b309745c..adfb5858f554f7d9554dcc10fee237702dfd6b8e 100644
--- a/themes/kokodi/Makefile.am
+++ b/themes/kokodi/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Default/xfwm4
+themedir = $(datadir)/themes/Kokodi/xfwm4
 
 PNG_FILES = 								\
 	bottom-active.png						\