diff --git a/data/pekwm/themes/default/Jamfile b/data/pekwm/themes/pekwm/Jamfile
similarity index 100%
rename from data/pekwm/themes/default/Jamfile
rename to data/pekwm/themes/pekwm/Jamfile
diff --git a/data/pekwm/themes/default/arrow.png b/data/pekwm/themes/pekwm/arrow.png
similarity index 100%
rename from data/pekwm/themes/default/arrow.png
rename to data/pekwm/themes/pekwm/arrow.png
diff --git a/data/pekwm/themes/default/arrow_focus.png b/data/pekwm/themes/pekwm/arrow_focus.png
similarity index 100%
rename from data/pekwm/themes/default/arrow_focus.png
rename to data/pekwm/themes/pekwm/arrow_focus.png
diff --git a/data/pekwm/themes/default/bottom-border.png b/data/pekwm/themes/pekwm/bottom-border.png
similarity index 100%
rename from data/pekwm/themes/default/bottom-border.png
rename to data/pekwm/themes/pekwm/bottom-border.png
diff --git a/data/pekwm/themes/default/bottom-border_unfocus.png b/data/pekwm/themes/pekwm/bottom-border_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/bottom-border_unfocus.png
rename to data/pekwm/themes/pekwm/bottom-border_unfocus.png
diff --git a/data/pekwm/themes/default/bottom-left.png b/data/pekwm/themes/pekwm/bottom-left.png
similarity index 100%
rename from data/pekwm/themes/default/bottom-left.png
rename to data/pekwm/themes/pekwm/bottom-left.png
diff --git a/data/pekwm/themes/default/bottom-left_unfocus.png b/data/pekwm/themes/pekwm/bottom-left_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/bottom-left_unfocus.png
rename to data/pekwm/themes/pekwm/bottom-left_unfocus.png
diff --git a/data/pekwm/themes/default/bottom-right.png b/data/pekwm/themes/pekwm/bottom-right.png
similarity index 100%
rename from data/pekwm/themes/default/bottom-right.png
rename to data/pekwm/themes/pekwm/bottom-right.png
diff --git a/data/pekwm/themes/default/bottom-right_unfocus.png b/data/pekwm/themes/pekwm/bottom-right_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/bottom-right_unfocus.png
rename to data/pekwm/themes/pekwm/bottom-right_unfocus.png
diff --git a/data/pekwm/themes/default/button.png b/data/pekwm/themes/pekwm/button.png
similarity index 100%
rename from data/pekwm/themes/default/button.png
rename to data/pekwm/themes/pekwm/button.png
diff --git a/data/pekwm/themes/default/button_hover.png b/data/pekwm/themes/pekwm/button_hover.png
similarity index 100%
rename from data/pekwm/themes/default/button_hover.png
rename to data/pekwm/themes/pekwm/button_hover.png
diff --git a/data/pekwm/themes/default/button_press.png b/data/pekwm/themes/pekwm/button_press.png
similarity index 100%
rename from data/pekwm/themes/default/button_press.png
rename to data/pekwm/themes/pekwm/button_press.png
diff --git a/data/pekwm/themes/default/button_unfocus.png b/data/pekwm/themes/pekwm/button_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/button_unfocus.png
rename to data/pekwm/themes/pekwm/button_unfocus.png
diff --git a/data/pekwm/themes/default/item.png b/data/pekwm/themes/pekwm/item.png
similarity index 100%
rename from data/pekwm/themes/default/item.png
rename to data/pekwm/themes/pekwm/item.png
diff --git a/data/pekwm/themes/default/item_focus.png b/data/pekwm/themes/pekwm/item_focus.png
similarity index 100%
rename from data/pekwm/themes/default/item_focus.png
rename to data/pekwm/themes/pekwm/item_focus.png
diff --git a/data/pekwm/themes/default/left-border.png b/data/pekwm/themes/pekwm/left-border.png
similarity index 100%
rename from data/pekwm/themes/default/left-border.png
rename to data/pekwm/themes/pekwm/left-border.png
diff --git a/data/pekwm/themes/default/left-border_unfocus.png b/data/pekwm/themes/pekwm/left-border_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/left-border_unfocus.png
rename to data/pekwm/themes/pekwm/left-border_unfocus.png
diff --git a/data/pekwm/themes/default/menu-bottom.png b/data/pekwm/themes/pekwm/menu-bottom.png
similarity index 100%
rename from data/pekwm/themes/default/menu-bottom.png
rename to data/pekwm/themes/pekwm/menu-bottom.png
diff --git a/data/pekwm/themes/default/menu-bottom_unfocus.png b/data/pekwm/themes/pekwm/menu-bottom_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/menu-bottom_unfocus.png
rename to data/pekwm/themes/pekwm/menu-bottom_unfocus.png
diff --git a/data/pekwm/themes/default/menuline.png b/data/pekwm/themes/pekwm/menuline.png
similarity index 100%
rename from data/pekwm/themes/default/menuline.png
rename to data/pekwm/themes/pekwm/menuline.png
diff --git a/data/pekwm/themes/default/right-border.png b/data/pekwm/themes/pekwm/right-border.png
similarity index 100%
rename from data/pekwm/themes/default/right-border.png
rename to data/pekwm/themes/pekwm/right-border.png
diff --git a/data/pekwm/themes/default/right-border_unfocus.png b/data/pekwm/themes/pekwm/right-border_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/right-border_unfocus.png
rename to data/pekwm/themes/pekwm/right-border_unfocus.png
diff --git a/data/pekwm/themes/default/tab-separator.png b/data/pekwm/themes/pekwm/tab-separator.png
similarity index 100%
rename from data/pekwm/themes/default/tab-separator.png
rename to data/pekwm/themes/pekwm/tab-separator.png
diff --git a/data/pekwm/themes/default/tab-separator_unfocus.png b/data/pekwm/themes/pekwm/tab-separator_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/tab-separator_unfocus.png
rename to data/pekwm/themes/pekwm/tab-separator_unfocus.png
diff --git a/data/pekwm/themes/default/theme b/data/pekwm/themes/pekwm/theme
similarity index 100%
rename from data/pekwm/themes/default/theme
rename to data/pekwm/themes/pekwm/theme
diff --git a/data/pekwm/themes/default/title.png b/data/pekwm/themes/pekwm/title.png
similarity index 100%
rename from data/pekwm/themes/default/title.png
rename to data/pekwm/themes/pekwm/title.png
diff --git a/data/pekwm/themes/default/title_unfocus.png b/data/pekwm/themes/pekwm/title_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/title_unfocus.png
rename to data/pekwm/themes/pekwm/title_unfocus.png
diff --git a/data/pekwm/themes/default/top-border.png b/data/pekwm/themes/pekwm/top-border.png
similarity index 100%
rename from data/pekwm/themes/default/top-border.png
rename to data/pekwm/themes/pekwm/top-border.png
diff --git a/data/pekwm/themes/default/top-border_unfocus.png b/data/pekwm/themes/pekwm/top-border_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/top-border_unfocus.png
rename to data/pekwm/themes/pekwm/top-border_unfocus.png
diff --git a/data/pekwm/themes/default/top-left.png b/data/pekwm/themes/pekwm/top-left.png
similarity index 100%
rename from data/pekwm/themes/default/top-left.png
rename to data/pekwm/themes/pekwm/top-left.png
diff --git a/data/pekwm/themes/default/top-left_unfocus.png b/data/pekwm/themes/pekwm/top-left_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/top-left_unfocus.png
rename to data/pekwm/themes/pekwm/top-left_unfocus.png
diff --git a/data/pekwm/themes/default/top-right.png b/data/pekwm/themes/pekwm/top-right.png
similarity index 100%
rename from data/pekwm/themes/default/top-right.png
rename to data/pekwm/themes/pekwm/top-right.png
diff --git a/data/pekwm/themes/default/top-right_unfocus.png b/data/pekwm/themes/pekwm/top-right_unfocus.png
similarity index 100%
rename from data/pekwm/themes/default/top-right_unfocus.png
rename to data/pekwm/themes/pekwm/top-right_unfocus.png