diff --git a/config/illume-home/e.src b/config/illume-home/e.src
index c63c97ed4..02a8ec00a 100644
--- a/config/illume-home/e.src
+++ b/config/illume-home/e.src
@@ -1198,24 +1198,12 @@ group "E_Config" struct {
             value "delayed" uchar: 1;
             value "priority" int: 0;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_scale";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
-        }
         group "E_Config_Module" struct {
             value "name" string: "conf_display";
             value "enabled" uchar: 1;
             value "delayed" uchar: 1;
             value "priority" int: 0;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_startup";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
-        }
         group "E_Config_Module" struct {
             value "name" string: "start";
             value "enabled" uchar: 1;
diff --git a/config/illume/e.src b/config/illume/e.src
index 0a0f3ee18..cb5dc2346 100644
--- a/config/illume/e.src
+++ b/config/illume/e.src
@@ -79,22 +79,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse_cursor";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_transitions";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_display";
@@ -111,22 +95,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_fonts";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_startup";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_theme";
@@ -135,14 +103,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_wallpaper";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "dropshadow";
@@ -151,14 +111,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_scale";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "gadman";
diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index b08bb3a30..a1e9a1154 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -81,22 +81,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_borders";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_colors";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_dialogs";
@@ -113,22 +97,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_fonts";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_icon_theme";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_intl";
@@ -153,14 +121,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse_cursor";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_paths";
@@ -193,14 +153,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_startup";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_theme";
@@ -209,22 +161,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_transitions";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_wallpaper";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_window_manipulation";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index f9c60cf6f..a6e8b18bc 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -113,22 +113,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_borders";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_colors";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_dialogs";
@@ -145,22 +129,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_fonts";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_icon_theme";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_intl";
@@ -185,14 +153,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse_cursor";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_paths";
@@ -225,14 +185,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_startup";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_theme";
@@ -241,22 +193,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_transitions";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_wallpaper";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_window_manipulation";
@@ -289,14 +225,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_scale";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_window_remembers";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 4c371c215..b5c69ab31 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -48,14 +48,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_scale";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_interaction";
@@ -80,22 +72,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_wallpaper";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_transitions";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_theme";
@@ -104,14 +80,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_startup";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_shelves";
@@ -144,14 +112,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse_cursor";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_menus";
@@ -176,22 +136,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_icon_theme";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_fonts";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_display";
@@ -208,22 +152,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_colors";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_borders";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_applications";
diff --git a/config/standard/e.src b/config/standard/e.src
index 78a312951..0e37ab16f 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -48,14 +48,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_scale";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_interaction";
@@ -80,22 +72,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_wallpaper";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_transitions";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_theme";
@@ -104,14 +80,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_startup";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_shelves";
@@ -144,14 +112,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_mouse_cursor";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_menus";
@@ -176,22 +136,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_icon_theme";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_fonts";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_display";
@@ -208,22 +152,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_colors";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_borders";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_applications";
diff --git a/configure.ac b/configure.ac
index aab2885c0..fe74a12c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -676,16 +676,8 @@ AC_E_OPTIONAL_MODULE([fileman], true)
 AC_E_OPTIONAL_MODULE([fileman_opinfo], true)
 AC_E_OPTIONAL_MODULE([wizard], true)
 AC_E_OPTIONAL_MODULE([conf], true)
-AC_E_OPTIONAL_MODULE([conf_wallpaper], true)
 AC_E_OPTIONAL_MODULE([conf_wallpaper2], true)
 AC_E_OPTIONAL_MODULE([conf_theme], true, [CHECK_MODULE_CONF_THEME])
-AC_E_OPTIONAL_MODULE([conf_colors], true)
-AC_E_OPTIONAL_MODULE([conf_fonts], true)
-AC_E_OPTIONAL_MODULE([conf_borders], true)
-AC_E_OPTIONAL_MODULE([conf_icon_theme], true)
-AC_E_OPTIONAL_MODULE([conf_mouse_cursor], true)
-AC_E_OPTIONAL_MODULE([conf_transitions], true)
-AC_E_OPTIONAL_MODULE([conf_startup], true)
 AC_E_OPTIONAL_MODULE([conf_intl], true)
 AC_E_OPTIONAL_MODULE([msgbus], true)
 AC_E_OPTIONAL_MODULE([conf_applications], true)
@@ -700,7 +692,6 @@ AC_E_OPTIONAL_MODULE([conf_dialogs], true)
 AC_E_OPTIONAL_MODULE([conf_performance], true)
 AC_E_OPTIONAL_MODULE([conf_paths], true)
 AC_E_OPTIONAL_MODULE([conf_interaction], true)
-AC_E_OPTIONAL_MODULE([conf_scale], true)
 AC_E_OPTIONAL_MODULE([gadman], true)
 AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
 AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
@@ -777,30 +768,12 @@ src/modules/fileman_opinfo/module.desktop
 src/modules/wizard/Makefile
 src/modules/conf/Makefile
 src/modules/conf/module.desktop
-src/modules/conf_wallpaper/Makefile
-src/modules/conf_wallpaper/module.desktop
 src/modules/conf_wallpaper2/Makefile
 src/modules/conf_wallpaper2/module.desktop
 src/modules/conf_theme/Makefile
 src/modules/conf_theme/module.desktop
-src/modules/conf_colors/Makefile
-src/modules/conf_colors/module.desktop
-src/modules/conf_fonts/Makefile
-src/modules/conf_fonts/module.desktop
-src/modules/conf_borders/Makefile
-src/modules/conf_borders/module.desktop
-src/modules/conf_icon_theme/Makefile
-src/modules/conf_icon_theme/module.desktop
-src/modules/conf_mouse_cursor/Makefile
-src/modules/conf_mouse_cursor/module.desktop
-src/modules/conf_transitions/Makefile
-src/modules/conf_transitions/module.desktop
-src/modules/conf_startup/Makefile
-src/modules/conf_startup/module.desktop
 src/modules/conf_intl/Makefile
 src/modules/conf_intl/module.desktop
-src/modules/msgbus/Makefile
-src/modules/msgbus/module.desktop
 src/modules/conf_applications/Makefile
 src/modules/conf_applications/module.desktop
 src/modules/conf_display/Makefile
@@ -825,8 +798,8 @@ src/modules/conf_paths/Makefile
 src/modules/conf_paths/module.desktop
 src/modules/conf_interaction/Makefile
 src/modules/conf_interaction/module.desktop
-src/modules/conf_scale/Makefile
-src/modules/conf_scale/module.desktop
+src/modules/msgbus/Makefile
+src/modules/msgbus/module.desktop
 src/modules/gadman/Makefile
 src/modules/gadman/module.desktop
 src/modules/mixer/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6630b6364..1fab46c9d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -133,10 +133,6 @@ src/modules/conf/e_conf.c
 src/modules/conf/e_mod_main.c
 src/modules/conf_applications/e_int_config_apps.c
 src/modules/conf_applications/e_mod_main.c
-src/modules/conf_borders/e_int_config_borders.c
-src/modules/conf_borders/e_mod_main.c
-src/modules/conf_colors/e_int_config_color_classes.c
-src/modules/conf_colors/e_mod_main.c
 src/modules/conf_dialogs/e_int_config_profiles.c
 src/modules/conf_dialogs/e_int_config_dialogs.c
 src/modules/conf_dialogs/e_mod_main.c
@@ -150,10 +146,6 @@ src/modules/conf_display/e_int_config_dpms.c
 src/modules/conf_display/e_mod_main.c
 src/modules/conf_edgebindings/e_int_config_edgebindings.c
 src/modules/conf_edgebindings/e_mod_main.c
-src/modules/conf_fonts/e_int_config_fonts.c
-src/modules/conf_fonts/e_mod_main.c
-src/modules/conf_icon_theme/e_int_config_icon_themes.c
-src/modules/conf_icon_theme/e_mod_main.c
 src/modules/conf_interaction/e_int_config_interaction.c
 src/modules/conf_interaction/e_int_config_mouse.c
 src/modules/conf_interaction/e_mod_main.c
@@ -166,29 +158,28 @@ src/modules/conf_keybindings/e_int_config_mousebindings.c
 src/modules/conf_keybindings/e_mod_main.c
 src/modules/conf_menus/e_int_config_menus.c
 src/modules/conf_menus/e_mod_main.c
-src/modules/conf_mouse_cursor/e_int_config_cursor.c
-src/modules/conf_mouse_cursor/e_mod_main.c
 src/modules/conf_paths/e_int_config_paths.c
 src/modules/conf_paths/e_mod_main.c
 src/modules/conf_performance/e_int_config_engine.c
 src/modules/conf_performance/e_int_config_performance.c
 src/modules/conf_performance/e_mod_main.c
-src/modules/conf_scale/e_int_config_scale.c
-src/modules/conf_scale/e_mod_main.c
 src/modules/conf_shelves/e_int_config_shelf.c
 src/modules/conf_shelves/e_mod_main.c
-src/modules/conf_startup/e_int_config_startup.c
-src/modules/conf_startup/e_mod_main.c
+src/modules/conf_theme/e_int_config_wallpaper.c
+src/modules/conf_theme/e_int_config_wallpaper_import.c
+src/modules/conf_theme/e_int_config_wallpaper_web.c
+src/modules/conf_theme/e_int_config_borders.c
+src/modules/conf_theme/e_int_config_color_classes.c
+src/modules/conf_theme/e_int_config_fonts.c
+src/modules/conf_theme/e_int_config_icon_themes.c
+src/modules/conf_theme/e_int_config_cursor.c
+src/modules/conf_theme/e_int_config_scale.c
+src/modules/conf_theme/e_int_config_startup.c
+src/modules/conf_theme/e_int_config_transitions.c
 src/modules/conf_theme/e_int_config_theme.c
 src/modules/conf_theme/e_int_config_theme_import.c
 src/modules/conf_theme/e_int_config_theme_web.c
 src/modules/conf_theme/e_mod_main.c
-src/modules/conf_transitions/e_int_config_transitions.c
-src/modules/conf_transitions/e_mod_main.c
-src/modules/conf_wallpaper/e_int_config_wallpaper.c
-src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
-src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
-src/modules/conf_wallpaper/e_mod_main.c
 src/modules/conf_window_manipulation/e_int_config_clientlist.c
 src/modules/conf_window_manipulation/e_int_config_window_display.c
 src/modules/conf_window_manipulation/e_int_config_focus.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index bc09a1969..b4990bef4 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -58,10 +58,6 @@ if USE_MODULE_CONF
 SUBDIRS += conf
 endif
 
-if USE_MODULE_CONF_WALLPAPER
-SUBDIRS += conf_wallpaper
-endif
-
 if USE_MODULE_CONF_WALLPAPER2
 SUBDIRS += conf_wallpaper2
 endif
@@ -70,34 +66,6 @@ if USE_MODULE_CONF_THEME
 SUBDIRS += conf_theme
 endif
 
-if USE_MODULE_CONF_COLORS
-SUBDIRS += conf_colors
-endif
-
-if USE_MODULE_CONF_FONTS
-SUBDIRS += conf_fonts
-endif
-
-if USE_MODULE_CONF_BORDERS
-SUBDIRS += conf_borders
-endif
-
-if USE_MODULE_CONF_ICON_THEME
-SUBDIRS += conf_icon_theme
-endif
-
-if USE_MODULE_CONF_MOUSE_CURSOR
-SUBDIRS += conf_mouse_cursor
-endif
-
-if USE_MODULE_CONF_TRANSITIONS
-SUBDIRS += conf_transitions
-endif
-
-if USE_MODULE_CONF_STARTUP
-SUBDIRS += conf_startup
-endif
-
 if USE_MODULE_CONF_INTL
 SUBDIRS += conf_intl
 endif
@@ -154,10 +122,6 @@ if USE_MODULE_CONF_INTERACTION
 SUBDIRS += conf_interaction
 endif
 
-if USE_MODULE_CONF_SCALE
-SUBDIRS += conf_scale
-endif
-
 if USE_MODULE_GADMAN
 SUBDIRS += gadman
 endif
diff --git a/src/modules/conf_borders/.cvsignore b/src/modules/conf_borders/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_borders/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_borders/Makefile.am b/src/modules/conf_borders/Makefile.am
deleted file mode 100644
index 6f9da3cb6..000000000
--- a/src/modules/conf_borders/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_borders
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_borders.c \
-                         e_int_config_borders.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_borders/e-module-conf_borders.edj b/src/modules/conf_borders/e-module-conf_borders.edj
deleted file mode 100644
index c3d87e852..000000000
Binary files a/src/modules/conf_borders/e-module-conf_borders.edj and /dev/null differ
diff --git a/src/modules/conf_borders/e_mod_main.c b/src/modules/conf_borders/e_mod_main.c
deleted file mode 100644
index d35f696f3..000000000
--- a/src/modules/conf_borders/e_mod_main.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Borders"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
-   e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, "preferences-system-windows", e_int_config_borders);
-   e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
-   e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "preferences-system-windows", e_int_config_borders_border);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "internal/borders_border"))) 
-     e_object_del(E_OBJECT(cfd));
-   while ((cfd = e_config_dialog_get("E", "appearance/borders"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("internal/borders_border");
-   e_configure_registry_category_del("internal");
-   e_configure_registry_item_del("appearance/borders");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_borders/e_mod_main.h b/src/modules/conf_borders/e_mod_main.h
deleted file mode 100644
index e1455f77d..000000000
--- a/src/modules/conf_borders/e_mod_main.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_borders.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_borders.h"
-
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_borders/module.desktop.in b/src/modules/conf_borders/module.desktop.in
deleted file mode 100644
index 791ab0990..000000000
--- a/src/modules/conf_borders/module.desktop.in
+++ /dev/null
@@ -1,36 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Borders
-Name[ru]=Бордюры
-Name[cs]=Rámy
-Name[de]=
-Name[el]=Περιγράμματα
-Name[eo]=Randoj
-Name[es]=Bordes
-Name[fr]=Bordures
-Name[hu]=Ablakkeret
-Name[it]=Bordi
-Name[ja]=
-Name[pt]=Contornos
-Name[pt_BR]=
-Name[tr]=Sınırlar
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_borders
-Comment=Used to select a default border style.
-Comment[ru]=Используется для выбора стиля бордюра по умолчанию.
-Comment[cs]=Volby výchozího rámu okna.
-Comment[de]=
-Comment[el]=Χρησιμοποιείται για την επιλογή προκαθορισμένου στυλ περιγράμματος.
-Comment[eo]=Elekti pravaloran randan stilon.
-Comment[es]=USado para elegir un diseño de borde predeterminado.
-Comment[fr]=Permet de choisir le style de bordure par défaut.
-Comment[hu]=Beállíthatod az alapértelmezett ablakkeret stílust.
-Comment[it]=Usato per selezionare uno stile di bordo predefinito.
-Comment[ja]=
-Comment[pt]=Permite-lhe escolher o estilo dos contornos
-Comment[pt_BR]=
-Comment[tr]=Öntanımlı sınır biçimini seçmekte kullanılır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_colors/.cvsignore b/src/modules/conf_colors/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_colors/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_colors/Makefile.am b/src/modules/conf_colors/Makefile.am
deleted file mode 100644
index 287995d0c..000000000
--- a/src/modules/conf_colors/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_colors
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_color_classes.c \
-			 e_int_config_color_classes.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_colors/e-module-conf_colors.edj b/src/modules/conf_colors/e-module-conf_colors.edj
deleted file mode 100644
index e125980d0..000000000
Binary files a/src/modules/conf_colors/e-module-conf_colors.edj and /dev/null differ
diff --git a/src/modules/conf_colors/e_mod_main.c b/src/modules/conf_colors/e_mod_main.c
deleted file mode 100644
index 4be948084..000000000
--- a/src/modules/conf_colors/e_mod_main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Colors"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m __UNUSED__)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
-                                     "preferences-look");
-   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
-                                 "preferences-desktop-color",
-                                 e_int_config_color_classes);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "appearance/colors")))
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("appearance/colors");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_colors/e_mod_main.h b/src/modules/conf_colors/e_mod_main.h
deleted file mode 100644
index 6cbb7b733..000000000
--- a/src/modules/conf_colors/e_mod_main.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_color_classes.h"
-#undef E_TYPEDEFS
-#include "e_int_config_color_classes.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_colors/module.desktop.in b/src/modules/conf_colors/module.desktop.in
deleted file mode 100644
index 18fa239ff..000000000
--- a/src/modules/conf_colors/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Colors
-Name[ru]=Цвета
-Name[cs]=Barvy
-Name[de]=
-Name[eo]=Koloroj
-Name[es]=Colores
-Name[fr]=Couleurs
-Name[hu]=Színek
-Name[it]=Colori
-Name[ja]=
-Name[pt]=Cores
-Name[pt_BR]=
-Name[tr]=Renkler
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_colors
-Comment=Used to customize the color classes.
-Comment[ru]=Используется для настройки цветовых классов.
-Comment[cs]=Určen k nastavení tříd barev.
-Comment[de]=
-Comment[eo]=Adapti la kolorajn grupojn.
-Comment[es]=Usado para personalizar las clases de colores.
-Comment[fr]=Permet de personnaliser les classes de couleurs.
-Comment[hu]=Itt szín beállításokat végezhetsz.
-Comment[it]=Usato per la personalizzazione delle classi di colore.
-Comment[ja]=
-Comment[pt]=Permite-lhe personalizar as classes das cores
-Comment[pt_BR]=
-Comment[tr]=Renkleri özelleştirmekte kullanılır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_fonts/.cvsignore b/src/modules/conf_fonts/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_fonts/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_fonts/Makefile.am b/src/modules/conf_fonts/Makefile.am
deleted file mode 100644
index 21844baea..000000000
--- a/src/modules/conf_fonts/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_fonts
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_fonts.c \
-			 e_int_config_fonts.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_fonts/e_mod_main.c b/src/modules/conf_fonts/e_mod_main.c
deleted file mode 100644
index 66b5a3bb4..000000000
--- a/src/modules/conf_fonts/e_mod_main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-   "Settings - Fonts"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-look");
-   e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, 
-                                 "preferences-desktop-font", 
-                                 e_int_config_fonts);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "appearance/fonts"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("appearance/fonts");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_fonts/e_mod_main.h b/src/modules/conf_fonts/e_mod_main.h
deleted file mode 100644
index 82d0a0919..000000000
--- a/src/modules/conf_fonts/e_mod_main.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_fonts.h"
-#undef E_TYPEDEFS
-#include "e_int_config_fonts.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_fonts/module.desktop.in b/src/modules/conf_fonts/module.desktop.in
deleted file mode 100644
index cbd428b6c..000000000
--- a/src/modules/conf_fonts/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Fonts
-Name[ru]=Шрифты
-Name[cs]=Písmo
-Name[de]=
-Name[eo]=Tiparoj
-Name[es]=Fuentes
-Name[fr]=Polices
-Name[hu]=Betűtípusok
-Name[it]=Font
-Name[ja]=
-Name[pt]=Tipo de letra
-Name[pt_BR]=
-Name[tr]=Yazıtipleri
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-font
-Comment=Font configuration dialog.
-Comment[ru]=Диалог конфигурации шрифтов.
-Comment[cs]=Dialog pro výběr písma.
-Comment[de]=
-Comment[eo]=Dialogo de agordo de tiparoj.
-Comment[es]=Diálogo de configuración de fuentes.
-Comment[fr]=Interface de configuration des polices.
-Comment[hu]=Kiválaszthatod a számodra legmegfelellőbb betűtípust.
-Comment[it]=Interfaccia per la configurazione dei font.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar o tipo de letra
-Comment[pt_BR]=
-Comment[tr]=Yazıtipi yapılandırma diyaloğu.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_icon_theme/.cvsignore b/src/modules/conf_icon_theme/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_icon_theme/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_icon_theme/Makefile.am b/src/modules/conf_icon_theme/Makefile.am
deleted file mode 100644
index ed7d387d2..000000000
--- a/src/modules/conf_icon_theme/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_icon_theme
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_icon_themes.c \
-                         e_int_config_icon_themes.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_icon_theme/e-module-conf_icon_theme.edj b/src/modules/conf_icon_theme/e-module-conf_icon_theme.edj
deleted file mode 100644
index 751632243..000000000
Binary files a/src/modules/conf_icon_theme/e-module-conf_icon_theme.edj and /dev/null differ
diff --git a/src/modules/conf_icon_theme/e_mod_main.c b/src/modules/conf_icon_theme/e_mod_main.c
deleted file mode 100644
index 7d944473d..000000000
--- a/src/modules/conf_icon_theme/e_mod_main.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Icon Theme"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
-   e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, "preferences-icon-theme", e_int_config_icon_themes);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "appearance/icon_theme"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("appearance/icon_theme");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_icon_theme/e_mod_main.h b/src/modules/conf_icon_theme/e_mod_main.h
deleted file mode 100644
index 883dd0bb5..000000000
--- a/src/modules/conf_icon_theme/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_icon_themes.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_icon_themes.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_icon_theme/module.desktop.in b/src/modules/conf_icon_theme/module.desktop.in
deleted file mode 100644
index 6a2436835..000000000
--- a/src/modules/conf_icon_theme/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Icon Theme
-Name[ru]=Тема иконок
-Name[cs]=Téma ikon
-Name[de]=
-Name[eo]=Piktograma etoso
-Name[es]=Tema de íconos
-Name[fr]=Thème d'icones
-Name[hu]=Ikon téma
-Name[it]=Temi di icone
-Name[ja]=
-Name[pt]=Tema de ícones
-Name[pt_BR]=
-Name[tr]=Simge Teması
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_icon_theme
-Comment=Settings applet used to select an icon theme for E17.
-Comment[ru]=Апплет настроек для выбора темы иконок E17.
-Comment[cs]=Určen k výběru tématu ikon freedesktop.org.
-Comment[de]=
-Comment[eo]=Elekti piktograman etoson por E17.
-Comment[es]=Applet de configuración usado para seleccionar el tema de íconos para E17.
-Comment[fr]=Permet de choisir un thème d'icones pour E17.
-Comment[hu]=Beállíthadod, hogy milyen ikon témát használjon az E17.
-Comment[it]=Applet di configurazione per la selezione di un tema di icone per E17.
-Comment[ja]=
-Comment[pt]=Permite-lhe selecionar o tema de ícones do E17
-Comment[pt_BR]=
-Comment[tr]=E17 simge temasını seçmek için kullanılan araç.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_mouse_cursor/.cvsignore b/src/modules/conf_mouse_cursor/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_mouse_cursor/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_mouse_cursor/Makefile.am b/src/modules/conf_mouse_cursor/Makefile.am
deleted file mode 100644
index 5dcaf4c77..000000000
--- a/src/modules/conf_mouse_cursor/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_mouse_cursor
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_cursor.c \
-                         e_int_config_cursor.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj b/src/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj
deleted file mode 100644
index f033137da..000000000
Binary files a/src/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj and /dev/null differ
diff --git a/src/modules/conf_mouse_cursor/e_mod_main.c b/src/modules/conf_mouse_cursor/e_mod_main.c
deleted file mode 100644
index 84aff5cb1..000000000
--- a/src/modules/conf_mouse_cursor/e_mod_main.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Mouse Cursor"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-look");
-   e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, "preferences-desktop-pointer", e_int_config_cursor);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "appearance/mouse_cursor"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("appearance/mouse_cursor");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_mouse_cursor/e_mod_main.h b/src/modules/conf_mouse_cursor/e_mod_main.h
deleted file mode 100644
index 13b456f05..000000000
--- a/src/modules/conf_mouse_cursor/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_cursor.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_cursor.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_mouse_cursor/module.desktop.in b/src/modules/conf_mouse_cursor/module.desktop.in
deleted file mode 100644
index 6a0d45262..000000000
--- a/src/modules/conf_mouse_cursor/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Mouse Cursor
-Name[ru]=Курсор мыши
-Name[cs]=Kurzor myši
-Name[de]=
-Name[eo]=Musa kursoro
-Name[es]=Cursor del mouse
-Name[fr]=Curseur de souris
-Name[hu]=Egér mutató
-Name[it]=Cursore del mouse
-Name[ja]=
-Name[pt]=Cursor do rato
-Name[pt_BR]=
-Name[tr]=Fare İmleci
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_mouse_cursor
-Comment=Select the mouse cursor style.
-Comment[ru]=Выбор стиля курсора мышки.
-Comment[cs]=Výběr stylu kurzoru myši.
-Comment[de]=
-Comment[eo]=Elekti la stilon de la musa kursoro.
-Comment[es]=Seleccione el diseño del cursor del mouse.
-Comment[fr]=Permet de choisir le style du curseur de souris.
-Comment[hu]=Az egér kurzor stílusának a beállítása.
-Comment[it]=Seleziona lo stile di puntatore per il mouse.
-Comment[ja]=
-Comment[pt]=Permite-lhe escolher o cursor do rato
-Comment[pt_BR]=
-Comment[tr]=Fare imleci biçemini seçin.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_scale/.cvsignore b/src/modules/conf_scale/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_scale/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_scale/Makefile.am b/src/modules/conf_scale/Makefile.am
deleted file mode 100644
index 0de9e3ab9..000000000
--- a/src/modules/conf_scale/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_scale
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_scale.c \
-                         e_int_config_scale.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_scale/e-module-conf_scale.edj b/src/modules/conf_scale/e-module-conf_scale.edj
deleted file mode 100644
index ddaec2050..000000000
Binary files a/src/modules/conf_scale/e-module-conf_scale.edj and /dev/null differ
diff --git a/src/modules/conf_scale/e_mod_main.c b/src/modules/conf_scale/e_mod_main.c
deleted file mode 100644
index 92420fefb..000000000
--- a/src/modules/conf_scale/e_mod_main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Scaling"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), 
-                                     NULL, "preferences-look");
-   e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL, 
-                                 "preferences-scale", e_int_config_scale);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "appearance/scale"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("appearance/scale");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_scale/e_mod_main.h b/src/modules/conf_scale/e_mod_main.h
deleted file mode 100644
index 1d022fdd1..000000000
--- a/src/modules/conf_scale/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_scale.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_scale.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_scale/module.desktop.in b/src/modules/conf_scale/module.desktop.in
deleted file mode 100644
index dc9a98b66..000000000
--- a/src/modules/conf_scale/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Scaling
-Name[ru]=Масштабирование
-Name[cs]=Škálování
-Name[de]=
-Name[eo]=Skalado
-Name[es]=
-Name[fr]=Mise à l'échelle
-Name[hu]=Kalibrálás
-Name[it]=Configurazione - Scalatura
-Name[ja]=
-Name[pt]=Escala
-Name[pt_BR]=
-Name[tr]=Ölçekleme
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_scale
-Comment=Used to configure how Display scaling is handled.
-Comment[ru]=Используется для конфигурации поддержки масштабирования экрана.
-Comment[cs]=Použit pro nastavení škálování displeje.
-Comment[de]=
-Comment[eo]=Permesas agordi la skaladon.
-Comment[es]=
-Comment[fr]=Permet de paramétrer la mise à l'échelle.
-Comment[hu]=A képernyő kalibrálására, DPI meghatározására szolgál.
-Comment[it]=Usata per configurare come verràgestita la scalatura dello schermo.
-Comment[ja]=
-Comment[pt]=Permite-lhe ajustar a escala do ecrã
-Comment[pt_BR]=
-Comment[tr]=Görünüm ölçeklemesinin yapılandırmak için kullanılır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_startup/.cvsignore b/src/modules/conf_startup/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_startup/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_startup/Makefile.am b/src/modules/conf_startup/Makefile.am
deleted file mode 100644
index 82e98ac51..000000000
--- a/src/modules/conf_startup/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_startup
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_startup.c \
-                         e_int_config_startup.h
-			 
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_startup/e-module-conf_startup.edj b/src/modules/conf_startup/e-module-conf_startup.edj
deleted file mode 100644
index 0bb6dc6b0..000000000
Binary files a/src/modules/conf_startup/e-module-conf_startup.edj and /dev/null differ
diff --git a/src/modules/conf_startup/e_mod_main.c b/src/modules/conf_startup/e_mod_main.c
deleted file mode 100644
index 1b4893c4d..000000000
--- a/src/modules/conf_startup/e_mod_main.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Startup"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-look");
-   e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL, 
-                                 "preferences-startup", e_int_config_startup);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "appearance/startup"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("appearance/startup");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_startup/e_mod_main.h b/src/modules/conf_startup/e_mod_main.h
deleted file mode 100644
index ba0f1dc6d..000000000
--- a/src/modules/conf_startup/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_startup.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_startup.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_startup/module.desktop.in b/src/modules/conf_startup/module.desktop.in
deleted file mode 100644
index 7cc865a92..000000000
--- a/src/modules/conf_startup/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Startup
-Name[ru]=Запуск
-Name[cs]=Spuštění
-Name[de]=
-Name[eo]=Startigo
-Name[es]=Inicio
-Name[fr]=Démarrage
-Name[hu]=Rendszerindítás
-Name[it]=Avvio
-Name[ja]=
-Name[pt]=Arranque
-Name[pt_BR]=
-Name[tr]=Açılış
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_startup
-Comment=Used to configure the E17 splash screen.
-Comment[ru]=Используется для конфигурации стартовой заставки E17.
-Comment[cs]=Použit k nastavení E17 spouštěcí obrazovky.
-Comment[de]=
-Comment[eo]=Agordi la salutŝildon de E17.
-Comment[es]=Usado para configurar la pantalla de inicio de E17.
-Comment[fr]=Permet de paramétrer l'écran de démarrage de E17.
-Comment[hu]=Lehetőséged van beállítani az E17 indító képernyőjét.
-Comment[it]=Usato per configurare lo splash screen di E17.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar o ecrã de arranque do E17
-Comment[pt_BR]=
-Comment[tr]=E17 açılış ekranını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_theme/Makefile.am b/src/modules/conf_theme/Makefile.am
index 05d95cfb1..6d9b1921e 100644
--- a/src/modules/conf_theme/Makefile.am
+++ b/src/modules/conf_theme/Makefile.am
@@ -22,12 +22,34 @@ pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH
 pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
-			 e_int_config_theme.c \
-			 e_int_config_theme.h \
-			 e_int_config_theme_import.c \
-			 e_int_config_theme_import.h \
-			 e_int_config_theme_web.c \
-			 e_int_config_theme_web.h
+                         e_int_config_borders.c \
+                         e_int_config_borders.h \
+                         e_int_config_color_classes.c \
+                         e_int_config_color_classes.h \
+                         e_int_config_cursor.c \
+                         e_int_config_cursor.h \
+                         e_int_config_fonts.c \
+                         e_int_config_fonts.h \
+                         e_int_config_icon_themes.c \
+                         e_int_config_icon_themes.h \
+                         e_int_config_scale.c \
+                         e_int_config_scale.h \
+                         e_int_config_startup.c \
+                         e_int_config_startup.h \
+                         e_int_config_theme.c \
+                         e_int_config_theme.h \
+                         e_int_config_theme_import.c \
+                         e_int_config_theme_import.h \
+                         e_int_config_theme_web.c \
+                         e_int_config_theme_web.h \
+                         e_int_config_transitions.c \
+                         e_int_config_transitions.h \
+                         e_int_config_wallpaper.c \
+                         e_int_config_wallpaper.h \
+                         e_int_config_wallpaper_import.c \
+                         e_int_config_wallpaper_import.h \
+                         e_int_config_wallpaper_web.c \
+                         e_int_config_wallpaper_web.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@ @EXCHANGE_LIBS@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_borders/e_int_config_borders.c b/src/modules/conf_theme/e_int_config_borders.c
similarity index 100%
rename from src/modules/conf_borders/e_int_config_borders.c
rename to src/modules/conf_theme/e_int_config_borders.c
diff --git a/src/modules/conf_borders/e_int_config_borders.h b/src/modules/conf_theme/e_int_config_borders.h
similarity index 100%
rename from src/modules/conf_borders/e_int_config_borders.h
rename to src/modules/conf_theme/e_int_config_borders.h
diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_theme/e_int_config_color_classes.c
similarity index 100%
rename from src/modules/conf_colors/e_int_config_color_classes.c
rename to src/modules/conf_theme/e_int_config_color_classes.c
diff --git a/src/modules/conf_colors/e_int_config_color_classes.h b/src/modules/conf_theme/e_int_config_color_classes.h
similarity index 100%
rename from src/modules/conf_colors/e_int_config_color_classes.h
rename to src/modules/conf_theme/e_int_config_color_classes.h
diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.c b/src/modules/conf_theme/e_int_config_cursor.c
similarity index 100%
rename from src/modules/conf_mouse_cursor/e_int_config_cursor.c
rename to src/modules/conf_theme/e_int_config_cursor.c
diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.h b/src/modules/conf_theme/e_int_config_cursor.h
similarity index 100%
rename from src/modules/conf_mouse_cursor/e_int_config_cursor.h
rename to src/modules/conf_theme/e_int_config_cursor.h
diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_theme/e_int_config_fonts.c
similarity index 100%
rename from src/modules/conf_fonts/e_int_config_fonts.c
rename to src/modules/conf_theme/e_int_config_fonts.c
diff --git a/src/modules/conf_fonts/e_int_config_fonts.h b/src/modules/conf_theme/e_int_config_fonts.h
similarity index 100%
rename from src/modules/conf_fonts/e_int_config_fonts.h
rename to src/modules/conf_theme/e_int_config_fonts.h
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_theme/e_int_config_icon_themes.c
similarity index 100%
rename from src/modules/conf_icon_theme/e_int_config_icon_themes.c
rename to src/modules/conf_theme/e_int_config_icon_themes.c
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.h b/src/modules/conf_theme/e_int_config_icon_themes.h
similarity index 100%
rename from src/modules/conf_icon_theme/e_int_config_icon_themes.h
rename to src/modules/conf_theme/e_int_config_icon_themes.h
diff --git a/src/modules/conf_scale/e_int_config_scale.c b/src/modules/conf_theme/e_int_config_scale.c
similarity index 100%
rename from src/modules/conf_scale/e_int_config_scale.c
rename to src/modules/conf_theme/e_int_config_scale.c
diff --git a/src/modules/conf_scale/e_int_config_scale.h b/src/modules/conf_theme/e_int_config_scale.h
similarity index 100%
rename from src/modules/conf_scale/e_int_config_scale.h
rename to src/modules/conf_theme/e_int_config_scale.h
diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_theme/e_int_config_startup.c
similarity index 100%
rename from src/modules/conf_startup/e_int_config_startup.c
rename to src/modules/conf_theme/e_int_config_startup.c
diff --git a/src/modules/conf_startup/e_int_config_startup.h b/src/modules/conf_theme/e_int_config_startup.h
similarity index 100%
rename from src/modules/conf_startup/e_int_config_startup.h
rename to src/modules/conf_theme/e_int_config_startup.h
diff --git a/src/modules/conf_transitions/e_int_config_transitions.c b/src/modules/conf_theme/e_int_config_transitions.c
similarity index 100%
rename from src/modules/conf_transitions/e_int_config_transitions.c
rename to src/modules/conf_theme/e_int_config_transitions.c
diff --git a/src/modules/conf_transitions/e_int_config_transitions.h b/src/modules/conf_theme/e_int_config_transitions.h
similarity index 100%
rename from src/modules/conf_transitions/e_int_config_transitions.h
rename to src/modules/conf_theme/e_int_config_transitions.h
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c
similarity index 100%
rename from src/modules/conf_wallpaper/e_int_config_wallpaper.c
rename to src/modules/conf_theme/e_int_config_wallpaper.c
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.h b/src/modules/conf_theme/e_int_config_wallpaper.h
similarity index 100%
rename from src/modules/conf_wallpaper/e_int_config_wallpaper.h
rename to src/modules/conf_theme/e_int_config_wallpaper.h
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c b/src/modules/conf_theme/e_int_config_wallpaper_import.c
similarity index 100%
rename from src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
rename to src/modules/conf_theme/e_int_config_wallpaper_import.c
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h b/src/modules/conf_theme/e_int_config_wallpaper_import.h
similarity index 100%
rename from src/modules/conf_wallpaper/e_int_config_wallpaper_import.h
rename to src/modules/conf_theme/e_int_config_wallpaper_import.h
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c b/src/modules/conf_theme/e_int_config_wallpaper_web.c
similarity index 100%
rename from src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
rename to src/modules/conf_theme/e_int_config_wallpaper_web.c
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.h b/src/modules/conf_theme/e_int_config_wallpaper_web.h
similarity index 100%
rename from src/modules/conf_wallpaper/e_int_config_wallpaper_web.h
rename to src/modules/conf_theme/e_int_config_wallpaper_web.h
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index a2919e095..7f2b5ad77 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -2,11 +2,13 @@
 #include "e_mod_main.h"
 
 /* actual module specifics */
-static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_mod_menu_add(void *data, E_Menu *m);
+static void _e_mod_run_wallpaper_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_mod_menu_wallpaper_add(void *data, E_Menu *m);
+static void _e_mod_run_theme_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_mod_menu_theme_add(void *data, E_Menu *m);
 
 static E_Module *conf_module = NULL;
-static E_Int_Menu_Augmentation *maug = NULL;
+static E_Int_Menu_Augmentation *maug[8] = {0};
 
 /* module setup */
 EAPI E_Module_Api e_modapi =
@@ -18,15 +20,52 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m)
 {
+   e_configure_registry_category_add("internal", -1, _("Internal"),
+                                     NULL, "enlightenment/internal");
+   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"),
+                                 NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
+   e_configure_registry_item_add("internal/borders_border", -1, _("Border"), 
+                                 NULL, "preferences-system-windows", e_int_config_borders_border);
+   
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
                                      "preferences-look");
+   e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL,
+                                 "preferences-desktop-wallpaper", 
+                                 e_int_config_wallpaper);
    e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, 
                                  "preferences-desktop-theme", 
                                  e_int_config_theme);
-
-   maug = 
+   e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
+                                 "preferences-desktop-color",
+                                 e_int_config_color_classes);
+   e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL,
+                                 "preferences-desktop-font",
+                                 e_int_config_fonts);
+   e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL, 
+                                 "preferences-system-windows", 
+                                 e_int_config_borders);
+   e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"), NULL, 
+                                 "preferences-icon-theme", 
+                                 e_int_config_icon_themes);
+   e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse Cursor"), NULL, 
+                                 "preferences-desktop-pointer", 
+                                 e_int_config_cursor);
+   e_configure_registry_item_add("appearance/transitions", 80, _("Transitions"), NULL,
+                                 "preferences-transitions",
+                                 e_int_config_transitions);
+   e_configure_registry_item_add("appearance/scale", 90, _("Scaling"), NULL,
+                                 "preferences-scale",
+                                 e_int_config_scale);
+   e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL,
+                                 "preferences-startup", 
+                                 e_int_config_startup);
+   
+   maug[0] =
+      e_int_menus_menu_augmentation_add_sorted("config/1", _("Wallpaper"),
+                                               _e_mod_menu_wallpaper_add, NULL, NULL, NULL);
+   maug[1] = 
      e_int_menus_menu_augmentation_add_sorted("config/1", _("Theme"), 
-                                              _e_mod_menu_add, NULL, NULL, NULL);
+                                              _e_mod_menu_theme_add, NULL, NULL, NULL);
 
    conf_module = m;
    e_module_delayed_set(m, 1);
@@ -39,17 +78,58 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    E_Config_Dialog *cfd;
 
    /* remove module-supplied menu additions */
-   if (maug)
+   if (maug[0])
      {
-	e_int_menus_menu_augmentation_del("config/1", maug);
-	maug = NULL;
+	e_int_menus_menu_augmentation_del("config/1", maug[0]);
+	maug[0] = NULL;
+     }
+   if (maug[1])
+     {
+	e_int_menus_menu_augmentation_del("config/1", maug[1]);
+	maug[1] = NULL;
      }
 
+   while ((cfd = e_config_dialog_get("E", "appearance/startup")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/scale")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/transitions")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/mouse_cursor")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/icon_theme")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/borders")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/fonts")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/colors")))
+      e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "apppearance/theme"))) 
-     e_object_del(E_OBJECT(cfd));
-
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
+      e_object_del(E_OBJECT(cfd));
+   
+   e_configure_registry_item_del("appearance/startup");
+   e_configure_registry_item_del("appearance/scale");
+   e_configure_registry_item_del("appearance/transitions");
+   e_configure_registry_item_del("appearance/mouse_cursor");
+   e_configure_registry_item_del("appearance/icon_theme");
+   e_configure_registry_item_del("appearance/borders");
+   e_configure_registry_item_del("appearance/fonts");
+   e_configure_registry_item_del("appearance/colors");
    e_configure_registry_item_del("appearance/theme");
+   e_configure_registry_item_del("appearance/wallpaper");
    e_configure_registry_category_del("appearance");
+   
+   while ((cfd = e_config_dialog_get("E", "internal/borders_border")))
+      e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
+      e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("appearance/borders");
+   e_configure_registry_item_del("internal/wallpaper_desk");
+   e_configure_registry_category_del("internal");
+   
    conf_module = NULL;
    return 1;
 }
@@ -60,21 +140,37 @@ e_modapi_save(E_Module *m __UNUSED__)
    return 1;
 }
 
-/* menu item callback(s) */
+/* menu item add hook */
+static void
+_e_mod_run_wallpaper_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
+{
+   e_configure_registry_call("appearance/wallpaper", m->zone->container, NULL);
+}
+
+static void
+_e_mod_menu_wallpaper_add(void *data __UNUSED__, E_Menu *m)
+{
+   E_Menu_Item *mi;
+   
+   mi = e_menu_item_new(m);
+   e_menu_item_label_set(mi, _("Wallpaper"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper");
+   e_menu_item_callback_set(mi, _e_mod_run_wallpaper_cb, NULL);
+}
+
 static void 
-_e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
+_e_mod_run_theme_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
 {
    e_configure_registry_call("appearance/theme", m->zone->container, NULL);
 }
 
-/* menu item add hook */
 static void
-_e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
+_e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m)
 {
    E_Menu_Item *mi;
    
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Theme"));
    e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
-   e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
+   e_menu_item_callback_set(mi, _e_mod_run_theme_cb, NULL);
 }
diff --git a/src/modules/conf_theme/e_mod_main.h b/src/modules/conf_theme/e_mod_main.h
index 2e78ceb60..9022f3c78 100644
--- a/src/modules/conf_theme/e_mod_main.h
+++ b/src/modules/conf_theme/e_mod_main.h
@@ -2,13 +2,36 @@
 #define E_MOD_MAIN_H
 
 #define E_TYPEDEFS 1
+#include "e_int_config_borders.h"
+#include "e_int_config_color_classes.h"
+#include "e_int_config_cursor.h"
+#include "e_int_config_fonts.h"
+#include "e_int_config_icon_themes.h"
+#include "e_int_config_scale.h"
+#include "e_int_config_startup.h"
 #include "e_int_config_theme.h"
 #include "e_int_config_theme_import.h"
 #include "e_int_config_theme_web.h"
+#include "e_int_config_transitions.h"
+#include "e_int_config_wallpaper.h"
+#include "e_int_config_wallpaper_import.h"
+#include "e_int_config_wallpaper_web.h"
+
 #undef E_TYPEDEFS
+#include "e_int_config_borders.h"
+#include "e_int_config_color_classes.h"
+#include "e_int_config_cursor.h"
+#include "e_int_config_fonts.h"
+#include "e_int_config_icon_themes.h"
+#include "e_int_config_scale.h"
+#include "e_int_config_startup.h"
 #include "e_int_config_theme.h"
 #include "e_int_config_theme_import.h"
 #include "e_int_config_theme_web.h"
+#include "e_int_config_transitions.h"
+#include "e_int_config_wallpaper.h"
+#include "e_int_config_wallpaper_import.h"
+#include "e_int_config_wallpaper_web.h"
 
 EAPI extern E_Module_Api e_modapi;
 
diff --git a/src/modules/conf_transitions/.cvsignore b/src/modules/conf_transitions/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_transitions/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_transitions/Makefile.am b/src/modules/conf_transitions/Makefile.am
deleted file mode 100644
index 06352d1a8..000000000
--- a/src/modules/conf_transitions/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_transitions
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_transitions.c \
-                         e_int_config_transitions.h
-			 
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_transitions/e-module-conf_transitions.edj b/src/modules/conf_transitions/e-module-conf_transitions.edj
deleted file mode 100644
index 2216bcb99..000000000
Binary files a/src/modules/conf_transitions/e-module-conf_transitions.edj and /dev/null differ
diff --git a/src/modules/conf_transitions/e_mod_main.c b/src/modules/conf_transitions/e_mod_main.c
deleted file mode 100644
index a994b7b00..000000000
--- a/src/modules/conf_transitions/e_mod_main.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Transitions"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-look");
-   e_configure_registry_item_add("appearance/transitions", 80, 
-                                 _("Transitions"), NULL, 
-                                 "preferences-transitions", 
-                                 e_int_config_transitions);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "appearance/transitions"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("appearance/transitions");
-   e_configure_registry_category_del("appearance");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_transitions/e_mod_main.h b/src/modules/conf_transitions/e_mod_main.h
deleted file mode 100644
index ee7dec666..000000000
--- a/src/modules/conf_transitions/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_transitions.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_transitions.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_transitions/module.desktop.in b/src/modules/conf_transitions/module.desktop.in
deleted file mode 100644
index b533eb69c..000000000
--- a/src/modules/conf_transitions/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Transitions
-Name[ru]=Переходы
-Name[cs]=Přechody
-Name[de]=
-Name[eo]=Transiroj
-Name[es]=Transiciones
-Name[fr]=Transitions
-Name[hu]=Átmenetek
-Name[it]=Transizioni
-Name[ja]=
-Name[pt]=Transicões
-Name[pt_BR]=
-Name[tr]=Geçişler
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_transitions
-Comment=Used to choose a default transition. Transitions are used upon wallpaper changes, among other things.
-Comment[ru]=Используется для выбора эффекта перехода. Переходы срабатывают при смене обоев, так и в других случаях.
-Comment[cs]=Volby přechodů. Použity při změně pozadí plochy a jiných akcích.
-Comment[de]=
-Comment[eo]=Elekti defaŭltan transiron. Transiroj estas uzataj dum ŝanĝoj de tapeto interalie.
-Comment[es]=Usado para elegir la transición predeterminada. Las transiciones se usan cuando se cambia el fondo de pantalla, entre otras cosas.
-Comment[fr]=Permet de choisir une transition par défaut. Les transitions sont utilisées lors des changements de fonds d'écran, entre autres.
-Comment[hu]=Ennek segítségével be tudod állítani az alapértelmezett átmeneteket a munkaasztal váltásnál, és a háttérkép váltásnál.
-Comment[it]=Usato per scegliere una transizione predefinita. Le transizioni sono usate al cambio di sfondo, e per altre cose.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar as transições a utilizar, entre outras coisas, nas alterações do papel de parede
-Comment[pt_BR]=
-Comment[tr]=Öntanımlı geçişi seçmekte kullanılır. Geçişler duvarkağıdı değişimleri gibi geçişlerde görünürler.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_wallpaper/.cvsignore b/src/modules/conf_wallpaper/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_wallpaper/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_wallpaper/Makefile.am b/src/modules/conf_wallpaper/Makefile.am
deleted file mode 100644
index 542fa8a48..000000000
--- a/src/modules/conf_wallpaper/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_wallpaper
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@ \
-			 @EXCHANGE_CFLAGS@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_wallpaper.c \
-			 e_int_config_wallpaper.h \
-			 e_int_config_wallpaper_import.c \
-			 e_int_config_wallpaper_import.h \
-			 e_int_config_wallpaper_web.c \
-			 e_int_config_wallpaper_web.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@ @EXCHANGE_LIBS@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
deleted file mode 100644
index 12ef8550e..000000000
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
+++ /dev/null
@@ -1,486 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-#define GRAD_H 0
-#define GRAD_V 1
-#define GRAD_DU 2
-#define GRAD_DD 3
-#define GRAD_RAD 4
-
-#define TYPE_LINEAR 0
-#define TYPE_RADIAL 1
-
-typedef struct _Import Import;
-
-struct _Import 
-{
-   E_Config_Dialog *parent;
-   E_Config_Dialog_Data *cfdata;
-  
-   E_Dialog    *dia;
-   
-   Evas_Object *fill_h_obj;
-   Evas_Object *fill_v_obj;
-   Evas_Object *fill_du_obj;
-   Evas_Object *fill_dd_obj;
-   Evas_Object *fill_rad_obj;
-
-   Evas_Object *well1, *well2;
-
-   Evas_Object *preview;
-
-   Ecore_Exe *exe;
-   Ecore_Event_Handler *exe_handler;
-   char *tmpf;
-   char *fdest;
-};
-
-struct _E_Config_Dialog_Data 
-{
-   char *name;   
-   int mode;
-   int spread;
-
-   E_Color *color1, *color2;
-};
-
-static void _import_edj_gen(Import *import);
-static Eina_Bool _import_cb_edje_cc_exit(void *data, int type, void *event);
-static void _import_cb_close(void *data, E_Dialog *dia);
-static void _import_cb_ok(void *data, E_Dialog *dia);
-static void _import_config_save(Import *import);
-static void _import_cb_dia_del(void *obj);
-static Evas_Object *_preview_widget_add(Evas *evas);
-static void _import_cb_on_change(void *data, Evas_Object *obj);
-static void _import_cb_color_swap(void *data, void *data2);
-
-E_Dialog *
-e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
-{
-   Evas *evas;
-   E_Dialog *dia;
-   Import *import;
-   Evas_Object *o, *ol, *of, *ord, *ot, *ott;
-   Evas_Coord mw, mh;
-   E_Radio_Group *rg;
-   E_Config_Dialog_Data *cfdata;
-
-   import = E_NEW(Import, 1);
-   if (!import) return NULL;
-
-   dia = e_dialog_new(parent->con, "E", "_wallpaper_gradient_dialog");
-   if (!dia) 
-     { 
-	free(import);
-	return NULL;	
-     }
-
-   dia->data = import;
-   e_object_del_attach_func_set(E_OBJECT(dia), _import_cb_dia_del);
-   e_win_centered_set(dia->win, 1);
-
-   cfdata = E_NEW(E_Config_Dialog_Data, 1);
-   cfdata->mode = GRAD_H;
-   cfdata->spread = 0;
-   import->cfdata = cfdata;
-   import->dia = dia;
-
-   cfdata->name = strdup("gradient");
-
-   evas = e_win_evas_get(dia->win);
-
-   import->parent = parent;
-
-   e_dialog_title_set(dia, _("Create a gradient..."));
-
-   cfdata->color1 = calloc(1, sizeof(E_Color));
-   cfdata->color1->a = 255;
-   cfdata->color2 = calloc(1, sizeof(E_Color));
-   cfdata->color2->a = 255;
-
-   cfdata->color1->r = e_config->wallpaper_grad_c1_r;
-   cfdata->color1->g = e_config->wallpaper_grad_c1_g;
-   cfdata->color1->b = e_config->wallpaper_grad_c1_b;
-   cfdata->color2->r = e_config->wallpaper_grad_c2_r;
-   cfdata->color2->g = e_config->wallpaper_grad_c2_g;
-   cfdata->color2->b = e_config->wallpaper_grad_c2_b;
-   e_color_update_rgb(cfdata->color1);
-   e_color_update_rgb(cfdata->color2);
-
-   ol = e_widget_list_add(evas, 0, 0);
-
-   ot = e_widget_table_add(evas, 0);
-   evas_object_show(ot);
-   ott = e_widget_table_add(evas, 0);
-   evas_object_show(ott);
-
-   o = e_widget_label_add(evas, _("Name:"));
-   evas_object_show(o);
-   e_widget_table_object_append(ott, o, 0, 0, 1, 1, 0, 1, 0, 1);
-
-   o = e_widget_label_add(evas, _("Color 1:"));
-   evas_object_show(o);
-   e_widget_table_object_append(ott, o, 0, 1, 1, 1, 0, 1, 0, 1);
-
-   o = e_widget_label_add(evas, _("Color 2:"));
-   evas_object_show(o);
-   e_widget_table_object_append(ott, o, 0, 2, 1, 1, 0, 1, 0, 1);
-
-   o = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
-   evas_object_show(o);
-   e_widget_table_object_append(ott, o, 1, 0, 1, 1, 1, 1, 1, 1);
-
-   o = e_widget_color_well_add(evas, cfdata->color1, 1);
-   e_widget_on_change_hook_set(o, _import_cb_on_change, import);
-   evas_object_show(o);
-   e_widget_table_object_append(ott, o, 1, 1, 1, 1, 1, 1, 1, 1);
-   import->well1 = o;
-
-   o = e_widget_color_well_add(evas, cfdata->color2, 1);
-   e_widget_on_change_hook_set(o, _import_cb_on_change, import);
-   evas_object_show(o);
-   e_widget_table_object_append(ott, o, 1, 2, 1, 1, 1, 1, 1, 1);
-   import->well2 = o;
-
-   o = e_widget_button_add(evas, "Swap Colors", "edit-swap", _import_cb_color_swap, import, NULL);
-   evas_object_show(o);
-   e_widget_table_object_append(ott, o, 1, 3, 1, 1, 1, 1, 1, 1);
-
-   e_widget_table_object_append(ot, ott, 0, 0, 1, 1, 1, 1, 1, 1);   
-
-   of = e_widget_framelist_add(evas, _("Preview"), 1);   
-   o = _preview_widget_add(evas);
-   evas_object_show(o);
-   evas_object_resize(o, 200, 150);
-   e_widget_size_min_set(o, 200, 150);
-   e_widget_framelist_object_append(of, o);
-   e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
-   import->preview = o;
-   _import_cb_on_change(import, NULL);
-   
-   of = e_widget_framelist_add(evas, _("Fill Options"), 1);
-   rg = e_widget_radio_group_new(&(cfdata->mode));
-
-   ord = e_widget_radio_icon_add(evas, _("Horizontal"), "enlightenment/gradient_h", 24, 24, GRAD_H, rg);
-   e_widget_on_change_hook_set(ord, _import_cb_on_change, import);
-   import->fill_h_obj = ord;
-   e_widget_framelist_object_append(of, ord);
-
-   ord = e_widget_radio_icon_add(evas, _("Vertical"), "enlightenment/gradient_v", 24, 24, GRAD_V, rg);
-   e_widget_on_change_hook_set(ord, _import_cb_on_change, import);
-   import->fill_h_obj = ord;
-   e_widget_framelist_object_append(of, ord);
-
-   ord = e_widget_radio_icon_add(evas, _("Diagonal Up"), "enlightenment/gradient_du", 24, 24, GRAD_DU, rg);
-   e_widget_on_change_hook_set(ord, _import_cb_on_change, import);
-   import->fill_h_obj = ord;
-   e_widget_framelist_object_append(of, ord);
-
-   ord = e_widget_radio_icon_add(evas, _("Diagonal Down"), "enlightenment/gradient_dd", 24, 24, GRAD_DD, rg);
-   e_widget_on_change_hook_set(ord, _import_cb_on_change, import);
-   import->fill_h_obj = ord;
-   e_widget_framelist_object_append(of, ord);
-
-   ord = e_widget_radio_icon_add(evas, _("Radial"), "enlightenment/gradient_rad", 24, 24, GRAD_RAD, rg);
-   e_widget_on_change_hook_set(ord, _import_cb_on_change, import);
-   import->fill_h_obj = ord;
-   e_widget_framelist_object_append(of, ord);
-
-   e_widget_table_object_append(ot, of, 0, 2, 2, 1, 1, 1, 1, 1);
-   e_widget_list_object_append(ol, ot, 1, 1, 0.5);
-
-   e_widget_size_min_get(ol, &mw, &mh);
-   e_dialog_content_set(dia, ol, mw, mh);
-
-   e_dialog_button_add(dia, _("OK"), NULL, _import_cb_ok, cfdata);
-   e_dialog_button_add(dia, _("Cancel"), NULL, _import_cb_close, cfdata);
-
-   e_dialog_resizable_set(dia, 0);
-   e_dialog_show(dia);
-   
-   e_dialog_border_icon_set(dia, "preferences-gradient");
-   return dia;
-}
-
-void
-e_int_config_wallpaper_gradient_del(E_Dialog *dia)
-{
-   Import *import;
-
-   import = dia->data;
-   _import_config_save(import);
-
-   if (import->exe_handler) ecore_event_handler_del(import->exe_handler);
-   import->exe_handler = NULL;
-   if (import->tmpf) unlink(import->tmpf);
-   E_FREE(import->tmpf);
-   E_FREE(import->fdest);
-   import->exe = NULL;
-
-   e_int_config_wallpaper_gradient_done(import->parent);
-   E_FREE(import->cfdata->name);
-   E_FREE(import->cfdata->color1);
-   E_FREE(import->cfdata->color2);
-   E_FREE(import->cfdata);
-   E_FREE(import);
-   e_object_unref(E_OBJECT(dia));
-
-}
-
-static void
-_import_config_save(Import *import)
-{
-   if (import->cfdata->color1)
-     {
-	e_config->wallpaper_grad_c1_r = import->cfdata->color1->r;
-	e_config->wallpaper_grad_c1_g = import->cfdata->color1->g;
-	e_config->wallpaper_grad_c1_b = import->cfdata->color1->b;
-     }
-   if (import->cfdata->color2)
-     {
-	e_config->wallpaper_grad_c2_r = import->cfdata->color2->r;
-	e_config->wallpaper_grad_c2_g = import->cfdata->color2->g;
-	e_config->wallpaper_grad_c2_b = import->cfdata->color2->b;
-     }
-   e_config_save_queue();
-}
-
-static void 
-_import_edj_gen(Import *import)
-{
-   int fd, num = 1;
-   const char *file;
-   char buf[4096], cmd[4096], tmpn[4096];
-   char *fstrip;
-   FILE *f;
-   size_t len, off;
-
-   file = import->cfdata->name;
-   fstrip = ecore_file_strip_ext(file);
-   if (!fstrip) return;
-   len = e_user_dir_snprintf(buf, sizeof(buf), "backgrounds/%s.edj", fstrip);
-   if (len >= sizeof(buf)) return;
-   off = len - (sizeof(".edj") - 1);
-   while (ecore_file_exists(buf))
-     {
-	snprintf(buf + off, sizeof(buf) - off, "-%d.edj", num);
-	num++;
-     }
-   free(fstrip);
-   strcpy(tmpn, "/tmp/e_bgdlg_new.edc-tmp-XXXXXX");
-   fd = mkstemp(tmpn);
-   if (fd < 0) 
-     {
-	printf("Error Creating tmp file: %s\n", strerror(errno));
-	return;
-     }
-   close(fd);
-  
-   f = fopen(tmpn, "w");
-   if (!f) 
-     {
-	printf("Cannot open %s for writing\n", tmpn);
-	return;
-     }
-   
-   fstrip = strdup(e_util_filename_escape(file));
-
-   fprintf(f,
-	 "spectra { spectrum { name: \"gradient\"; color: %d %d %d 255 1; color: %d %d %d 255 1; } }\n"
-	 "collections {\n"
-	 "group {\n"
-	 "name: \"e/desktop/background\";\n"
-	 "parts {\n"
-	 "part {\n"
-	 "  name: \"gradient\";\n"
-	 "  type: GRADIENT;\n"
-	 "  description {\n"
-	 "    state: \"default\" 0.0;\n"
-	 "    gradient.spectrum: \"gradient\";\n",
-	 import->cfdata->color1->r, import->cfdata->color1->g, import->cfdata->color1->b, 
-	 import->cfdata->color2->r, import->cfdata->color2->g, import->cfdata->color2->b);
-
-   switch (import->cfdata->mode) 
-     {
-      case GRAD_H:
-	 fprintf(f,
-	       "    gradient.rel1.relative: 0 0.5;\n"
-	       "    gradient.rel1.offset: 0 0;\n"
-	       "    gradient.rel2.relative: 1 0.5;\n"
-	       "    gradient.rel2.offset: -1 0;\n");
-	 break;
-      case GRAD_V:
-	 break;
-      case GRAD_DU:
-	 fprintf(f,
-	       "    gradient.rel1.relative: 0 1;\n"
-	       "    gradient.rel1.offset: 0 -1;\n"
-	       "    gradient.rel2.relative: 1 0;\n"
-	       "    gradient.rel2.offset: -1 0;\n");
-	 break;
-      case GRAD_DD:
-	 fprintf(f,
-	       "    gradient.rel1.relative: 0 0;\n"
-	       "    gradient.rel1.offset: 0 0;\n"
-	       "    gradient.rel2.relative: 1 1;\n"
-	       "    gradient.rel2.offset: -1 -1;\n");
-	 break;
-      case GRAD_RAD:
-	 fprintf(f,
-	       "    gradient.type: \"radial\";\n"
-	       "    fill.origin.relative: 0.5 0.5;\n");
-	 break;
-      default:
-	/* won't happen */
-	break;
-	
-     }
-   fprintf(f, "}}}}}\n");
-   free(fstrip);
-   
-   fclose(f);
-
-   snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s", 
-	    tmpn, e_util_filename_escape(buf));
-
-   import->tmpf = strdup(tmpn);
-   import->fdest = strdup(buf);
-   import->exe_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _import_cb_edje_cc_exit, import);
-   import->exe = ecore_exe_run(cmd, NULL);   
-}
-
-static Eina_Bool
-_import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event)
-{
-   Import *import;
-   Ecore_Exe_Event_Del *ev;
-  
-   ev = event;
-   import = data;
-   if (ev->exe != import->exe) return ECORE_CALLBACK_PASS_ON;
-
-   if (ev->exit_code != 0)
-     {
-	e_util_dialog_show(_("Gradient Creation Error"),
-			   _("For some reason, Enlightenment was unable to create a gradient."));
-     }
-   
-   e_int_config_wallpaper_update(import->parent, import->fdest);
-
-   e_int_config_wallpaper_gradient_del(import->dia);
-   return ECORE_CALLBACK_DONE;
-}
-
-static void 
-_import_cb_close(void *data, E_Dialog *dia) 
-{
-   e_int_config_wallpaper_gradient_del(dia);
-}
-
-static void 
-_import_cb_ok(void *data, E_Dialog *dia) 
-{
-   Import *import;
-
-   import = dia->data;
-
-   if (dia && import->cfdata->name)
-     {
-	_import_edj_gen(import);
-	return;
-     }
-   e_int_config_wallpaper_gradient_del(dia);
-}
-
-static void
-_import_cb_dia_del(void *obj)
-{
-   E_Dialog *dia = obj;
-   e_int_config_wallpaper_gradient_del(dia);
-}
-
-static Evas_Object *
-_preview_widget_add(Evas *evas)
-{
-   Evas_Object *obj, *o, *g;
-
-   obj = e_widget_add(evas);
-
-   o = edje_object_add(evas);
-   e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/gradpreview");
-   e_widget_sub_object_add(obj, o);
-   e_widget_resize_object_set(obj, o);
-   evas_object_show(o);
-
-   g = evas_object_gradient_add(evas);
-   evas_object_show(g);
-   e_widget_sub_object_add(obj, g);
-   edje_object_part_swallow(o, "e.swallow.content", g);
-
-   e_widget_data_set(obj, g);
-
-   return obj;
-}
-
-static void
-_import_cb_on_change(void *data, Evas_Object *obj)
-{
-   Import *import;
-   Evas_Object *grad;
-   Evas_Coord w, h;
-
-   import = data;
-
-   grad = e_widget_data_get(import->preview);
-   evas_object_geometry_get(grad, NULL, NULL, &w, &h);
-
-   evas_object_gradient_clear(grad);
-   evas_object_gradient_color_stop_add(grad, import->cfdata->color1->r, import->cfdata->color1->g, import->cfdata->color1->b, 255, 1);
-   evas_object_gradient_color_stop_add(grad, import->cfdata->color2->r, import->cfdata->color2->g, import->cfdata->color2->b, 255, 1);
-
-   switch (import->cfdata->mode)
-     {
-      case GRAD_H:
-	 evas_object_gradient_type_set(grad, "linear", NULL);
-	 evas_object_gradient_angle_set(grad, 270);
-	 evas_object_gradient_fill_set(grad, 0, 0, w, h);
-	 break;
-      case GRAD_V:
-	 evas_object_gradient_type_set(grad, "linear", NULL);
-	 evas_object_gradient_angle_set(grad, 0);
-	 evas_object_gradient_fill_set(grad, 0, 0, w, h);
-	 break;
-      case GRAD_DU:
-	 evas_object_gradient_type_set(grad, "linear.codiag", NULL);
-	 evas_object_gradient_angle_set(grad, 180);
-	 evas_object_gradient_fill_set(grad, 0, 0, w, h);
-	 break;
-      case GRAD_DD:
-	 evas_object_gradient_type_set(grad, "linear.diag", NULL);
-	 evas_object_gradient_angle_set(grad, 0);
-	 evas_object_gradient_fill_set(grad, 0, 0, w, h);
-	 break;
-      case GRAD_RAD:
-	 evas_object_gradient_type_set(grad, "radial", NULL);
-	 evas_object_gradient_fill_set(grad, w / 2, h / 2, w, h);
-	 break;
-     }
-}
-
-static void
-_import_cb_color_swap(void *data, void *data2)
-{
-   Import *import;
-   E_Color *tmp;
-
-   import = data;
-
-   tmp = malloc(sizeof(E_Color));
-   e_color_copy(import->cfdata->color1, tmp);
-   e_color_copy(import->cfdata->color2, import->cfdata->color1);
-   e_color_copy(tmp, import->cfdata->color2);
-
-   e_widget_color_well_update(import->well1);
-   e_widget_color_well_update(import->well2);
-   _import_cb_on_change(import, NULL);
-}
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h
deleted file mode 100644
index cb1b4a040..000000000
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_WALLPAPER_GRADIENT_H
-#define E_INT_CONFIG_WALLPAPER_GRADIENT_H
-
-E_Dialog *e_int_config_wallpaper_gradient(E_Config_Dialog *parent);
-void      e_int_config_wallpaper_gradient_del(E_Dialog *dia);
-
-#endif
-#endif
diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c
deleted file mode 100644
index db17ad1b1..000000000
--- a/src/modules/conf_wallpaper/e_mod_main.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _e_mod_menu_add(void *data, E_Menu *m);
-
-static E_Module *conf_module = NULL;
-static E_Int_Menu_Augmentation *maug = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Wallpaper"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("appearance", 10, _("Look"), NULL, 
-                                     "preferences-look");
-   e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, 
-                                 "preferences-desktop-wallpaper", e_int_config_wallpaper);
-   e_configure_registry_category_add("internal", -1, _("Internal"), 
-                                     NULL, "enlightenment/internal");
-   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), 
-                                 NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
-   maug = 
-     e_int_menus_menu_augmentation_add_sorted("config/1", _("Wallpaper"), 
-                                              _e_mod_menu_add, NULL, NULL, NULL);
-
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   /* remove module-supplied menu additions */
-   if (maug)
-     {
-	e_int_menus_menu_augmentation_del("config/1", maug);
-	maug = NULL;
-     }
-   while ((cfd = e_config_dialog_get("E", "appearance/wallpaper"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("internal/wallpaper_desk");
-   e_configure_registry_category_del("internal");
-   e_configure_registry_item_del("appearance/wallpaper");
-   e_configure_registry_category_del("appearance");
-
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
-
-/* menu item callback(s) */
-static void 
-_e_mod_run_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
-{
-   e_configure_registry_call("appearance/wallpaper", m->zone->container, NULL);
-}
-
-/* menu item add hook */
-static void
-_e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
-{
-   E_Menu_Item *mi;
-   
-   mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Wallpaper"));
-   e_util_menu_item_theme_icon_set(mi, "preferences-desktop-wallpaper");
-   e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
-}
diff --git a/src/modules/conf_wallpaper/e_mod_main.h b/src/modules/conf_wallpaper/e_mod_main.h
deleted file mode 100644
index 92980cea4..000000000
--- a/src/modules/conf_wallpaper/e_mod_main.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_wallpaper.h"
-#include "e_int_config_wallpaper_import.h"
-#include "e_int_config_wallpaper_web.h"
-#undef E_TYPEDEFS
-#include "e_int_config_wallpaper.h"
-#include "e_int_config_wallpaper_import.h"
-#include "e_int_config_wallpaper_web.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_wallpaper/module.desktop.in b/src/modules/conf_wallpaper/module.desktop.in
deleted file mode 100644
index 77d0b0b17..000000000
--- a/src/modules/conf_wallpaper/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Wallpaper
-Name[ru]=Обои
-Name[cs]=Pozadí plochy
-Name[de]=
-Name[eo]=Tapeto
-Name[es]=Fondo de pantalla
-Name[fr]=Fond d'écran
-Name[hu]=Háttérkép
-Name[it]=Sfondo
-Name[ja]=
-Name[pt]=Papel de parede
-Name[pt_BR]=
-Name[tr]=Duvarkağıdı
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-wallpaper
-Comment=Used to pick a wallpaper.
-Comment[ru]=Используется для выбора обоев.
-Comment[cs]=Použit k volbě pozadí.
-Comment[de]=
-Comment[eo]=Elekti tapeton.
-Comment[es]=Para elegir un fondo de pantalla.
-Comment[fr]=Permet de choisir un fond d'écran.
-Comment[hu]=Háttérkép beállító modul.
-Comment[it]=Usato per selezionare uno sfondo.
-Comment[ja]=
-Comment[pt]=Permite-lhe escolher o papel de parede
-Comment[pt_BR]=
-Comment[tr]=Duvarkağıdı seçiminde kullanılır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings