diff --git a/data/pekwm/themes/EdeClassic/theme b/data/pekwm/themes/EdeClassic/theme
index c49f264..007d9da 100755
--- a/data/pekwm/themes/EdeClassic/theme
+++ b/data/pekwm/themes/EdeClassic/theme
@@ -4,144 +4,187 @@
 
 $font = "Sans-9Left#XFT"
 
+Require {
+	Templates = "True"
+}
+
+Define = "DecorBase" {
+	Height = "25"
+	Pad = "6 10 10 8"
+	Focused = "Image title.png"
+	Unfocused = "Image title-unfocus.png"
+
+	Tab {
+		Focused = "Image title.png"
+		FocusedSelected = "Image title.png"
+		Unfocused = "Image title-unfocus.png"
+		UnfocusedSelected = "Image title-unfocus.png"
+	}
+
+	Separator {
+		Focused = "Empty"
+		Unfocused = "Empty"
+	}
+
+	Font {
+		Focused = "$font"
+	}
+
+	FontColor {
+		Focused = "#ffffff"
+		FocusedSelected = "#ffffff"
+		Unfocused = "#4b6983"
+		UnfocusedSelected = "#4b6983"
+	}
+}
+
+Define = "DecorButtons" {
+	Buttons {
+		Right = "Close" {
+			Focused = "Image close.png"
+			Unfocused = "Image close-unfocus.png"
+			Pressed = "Image close-press.png"
+			Button = "1" { Actions = "Close" }
+			Button = "3" { Actions = "Kill" }
+		}
+
+		Right = "Maximize" {
+			Focused = "Image max.png"
+			Unfocused = "Image max-unfocus.png"
+			Pressed = "Image max-press.png"
+			Button = "1" { Actions = "Toggle Maximized 1 1" }
+		}
+
+		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"
+			Top = "Image border.png"
+			TopRight = "Image border.png"
+			Left =  "Image border.png"
+			Right = "Image border.png"
+			BottomLeft = "Image border.png"
+			Bottom = "Image border.png"
+			BottomRight = "Image border.png"
+		}
+
+		Unfocused {
+			TopLeft = "Image border.png"
+			Top = "Image border.png"
+			TopRight = "Image border.png"
+			Left =  "Image border.png"
+			Right = "Image border.png"
+			BottomLeft = "Image border.png"
+			Bottom = "Image border.png"
+			BottomRight = "Image border.png"
+		}
+	}
+}
+
+Define = "DecorEmpty" {
+	Focused = "Empty"
+	Unfocused = "Empty"
+
+	Tab {
+		Focused = "Empty"
+		FocusedSelected = "Empty"
+		Unfocused = "Empty"
+		UnfocusedSelected = "Empty"
+	}
+
+	Separator {
+		Focused = "Empty"
+		Unfocused = "Empty"
+	}
+
+	Font {
+		Focused = "Empty"
+	}
+
+	FontColor {
+		Focused = "Empty"
+		FocusedSelected = "Empty"
+		Unfocused = "Empty"
+		UnfocusedSelected = "Empty"
+	}    
+
+	Border {
+		Focused {
+			TopLeft = "Empty"
+			Top = "Empty"
+			TopRight = "Empty"
+			Left =  "Empty"
+			Right = "Empty"
+			BottomLeft = "Empty"
+			Bottom = "Empty"
+			BottomRight = "Empty"
+		}
+
+		Unfocused {
+			TopLeft = "Empty"           
+			Top = "Empty"           
+			TopRight = "Empty"           
+			Left =  "Empty"           
+			Right = "Empty"           
+			BottomLeft = "Empty"           
+			Bottom = "Empty"           
+			BottomRight = "Empty"
+		}
+	}
+}
+
+
 PDecor {
 	Decor = "Default" {
 		Title {
-			Height = "25"
-			Pad = "6 10 10 8"
+			@DecorBase
+			@DecorButtons
+			@DecorBorder
+		}
+	}
 
-			Focused = "Image title.png"
-			Unfocused = "Image title-unfocus.png"
-
-			Tab {
-				Focused = "Image title.png"
-				FocusedSelected = "Image title.png"
-				Unfocused = "Image title-unfocus.png"
-				UnfocusedSelected = "Image title-unfocus.png"
-			}
-
-			Separator {
-				Focused = "Empty"
-				Unfocused = "Empty"
-			}
-
-			Font {
-				Focused = "$font"
-			}
-
-			FontColor {
-				Focused = "#ffffff"
-				FocusedSelected = "#ffffff"
-				Unfocused = "#4b6983"
-				UnfocusedSelected = "#4b6983"
-			}
-
-			Buttons {
-				Right {
-					Focused = "Image close.png"
-					Unfocused = "Image close-unfocus.png"
-					Pressed = "Image close-press.png"
-					Button = "1" { Actions = "Close" }
-					Button = "3" { Actions = "Kill" }
-				}
-
-				Right {
-					Focused = "Image max.png"
-					Unfocused = "Image max-unfocus.png"
-					Pressed = "Image max-press.png"
-					Button = "1" { Actions = "Toggle Maximized 1 1" }
-				}
-
-				Right {
-					Focused = "Image min.png"
-					Unfocused = "Image min-unfocus.png"
-					Pressed = "Image min-press.png"
-					Button = "1" { Actions = "Set Iconified" }
-				}
-			}
-
-			Border {
-				Focused {
-					TopLeft = "Image border.png"
-					Top = "Image border.png"
-					TopRight = "Image border.png"
-					Left =  "Image border.png"
-					Right = "Image border.png"
-					BottomLeft = "Image border.png"
-					Bottom = "Image border.png"
-					BottomRight = "Image border.png"
-				}
-				Unfocused {
-					TopLeft = "Image border.png"
-					Top = "Image border.png"
-					TopRight = "Image border.png"
-					Left =  "Image border.png"
-					Right = "Image border.png"
-					BottomLeft = "Image border.png"
-					Bottom = "Image border.png"
-					BottomRight = "Image border.png"
-				}
-			}
+	Decor = "Menu" {
+		Title {
+			@DecorBase
+			@DecorBorder
 		}
 	}
 
 	Decor = "Titlebarless" {
 		Title {
-			Focused = "Empty"
-			Unfocused = "Empty"
+			@DecorEmpty
+		}
+	}
 
-			Tab {
-				Focused = "Empty"
-				FocusedSelected = "Empty"
-				Unfocused = "Empty"
-				UnfocusedSelected = "Empty"
-			}
+	Decor = "Statuswindow" {
+		Title {
+			@DecorEmpty
+		}
+	}
 
-	                Separator {
-	                        Focused = "Empty"
-	                        Unfocused = "Empty"
-        	        }
-	                Font {
-	                        Focused = "Empty"
-	                }
-	                FontColor {
-	                        Focused = "Empty"
-	                        FocusedSelected = "Empty"
-	                        Unfocused = "Empty"
-	                        UnfocusedSelected = "Empty"
-	                }    
-			Border {
-				Focused {
-					TopLeft = "Empty"
-					Top = "Empty"
-					TopRight = "Empty"
-					Left =  "Empty"
-					Right = "Empty"
-					BottomLeft = "Empty"
-					Bottom = "Empty"
-					BottomRight = "Empty"
-				}
-				Unfocused {
-	                                TopLeft = "Empty"           
-	                                Top = "Empty"           
-        	                        TopRight = "Empty"           
-	                                Left =  "Empty"           
-	                                Right = "Empty"           
-	                                BottomLeft = "Empty"           
-	                                Bottom = "Empty"           
-	                                BottomRight = "Empty"
-				}
-			}
+	Decor = "WorkspaceIndicator" {
+		Title {
+			@DecorEmpty
+			@DecorBorder
 		}
 	}
 }
 
 Harbour {
-        Texture = "Solid #7f9ebc"
+	Texture = "Solid #7f9ebc"
 }
 
 Menu {
-	Pad = "2 4 7 7" 
+	Pad = "2 2 7 7" 
 
 	Focused {
 		Font = "$font"