Modularizing theme; adding few missing parts

data/pekwm/themes/EdeClassic/theme

@@ -4,12 +4,13 @@
 
 $font = "Sans-9Left#XFT"
 
-PDecor {
-	Decor = "Default" {
-		Title {
+Require {
+	Templates = "True"
+}
+
+Define = "DecorBase" {
 	Height = "25"
 	Pad = "6 10 10 8"
-
 	Focused = "Image title.png"
 	Unfocused = "Image title-unfocus.png"
 
@@ -35,9 +36,11 @@ PDecor {
 		Unfocused = "#4b6983"
 		UnfocusedSelected = "#4b6983"
 	}
+}
 
+Define = "DecorButtons" {
 	Buttons {
-				Right {
+		Right = "Close" {
 			Focused = "Image close.png"
 			Unfocused = "Image close-unfocus.png"
 			Pressed = "Image close-press.png"
@@ -45,21 +48,23 @@ PDecor {
 			Button = "3" { Actions = "Kill" }
 		}
 
-				Right {
+		Right = "Maximize" {
 			Focused = "Image max.png"
 			Unfocused = "Image max-unfocus.png"
 			Pressed = "Image max-press.png"
 			Button = "1" { Actions = "Toggle Maximized 1 1" }
 		}
 
-				Right {
+		Right = "Iconify" {
 			Focused = "Image min.png"
 			Unfocused = "Image min-unfocus.png"
 			Pressed = "Image min-press.png"
 			Button = "1" { Actions = "Set Iconified" }
 		}
 	}
+}
 
+Define = "DecorBorder" {
 	Border {
 		Focused {
 			TopLeft = "Image border.png"
@@ -71,6 +76,7 @@ PDecor {
 			Bottom = "Image border.png"
 			BottomRight = "Image border.png"
 		}
+
 		Unfocused {
 			TopLeft = "Image border.png"
 			Top = "Image border.png"
@@ -83,10 +89,8 @@ PDecor {
 		}
 	}
 }
-	}
 
-	Decor = "Titlebarless" {
-		Title {
+Define = "DecorEmpty" {
 	Focused = "Empty"
 	Unfocused = "Empty"
 
@@ -101,15 +105,18 @@ PDecor {
 		Focused = "Empty"
 		Unfocused = "Empty"
 	}
+
 	Font {
 		Focused = "Empty"
 	}
+
 	FontColor {
 		Focused = "Empty"
 		FocusedSelected = "Empty"
 		Unfocused = "Empty"
 		UnfocusedSelected = "Empty"
 	}    
+
 	Border {
 		Focused {
 			TopLeft = "Empty"
@@ -121,6 +128,7 @@ PDecor {
 			Bottom = "Empty"
 			BottomRight = "Empty"
 		}
+
 		Unfocused {
 			TopLeft = "Empty"           
 			Top = "Empty"           
@@ -133,6 +141,41 @@ PDecor {
 		}
 	}
 }
+
+
+PDecor {
+	Decor = "Default" {
+		Title {
+			@DecorBase
+			@DecorButtons
+			@DecorBorder
+		}
+	}
+
+	Decor = "Menu" {
+		Title {
+			@DecorBase
+			@DecorBorder
+		}
+	}
+
+	Decor = "Titlebarless" {
+		Title {
+			@DecorEmpty
+		}
+	}
+
+	Decor = "Statuswindow" {
+		Title {
+			@DecorEmpty
+		}
+	}
+
+	Decor = "WorkspaceIndicator" {
+		Title {
+			@DecorEmpty
+			@DecorBorder
+		}
 	}
 }
 
@@ -141,7 +184,7 @@ Harbour {
 }
 
 Menu {
-	Pad = "2 4 7 7" 
+	Pad = "2 2 7 7" 
 
 	Focused {
 		Font = "$font"