bigtime theme changes. bigtime.

5 files changed, 389 insertions, 391 deletions

diff --git a/themes/Allegro/openbox-3/themerc b/themes/Allegro/openbox-3/themerc
index ab783bfb..25d47573 100644
--- a/themes/Allegro/openbox-3/themerc
+++ b/themes/Allegro/openbox-3/themerc
@@ -11,92 +11,92 @@
 
 !----------------------------------------------------------menu--------!
 
-menu.title:                       raised gradient vertical
-menu.title.color:               #304060
-menu.title.colorTo:             #202540
-menu.title.textColor:           #f0f0f7
+menu.title.bg:                       raised gradient vertical
+menu.title.bg.color:               #304060
+menu.title.bg.colorTo:             #202540
+menu.title.text.color:           #f0f0f7
 !menu.title.font:
 !menu.title.justify:
 
-menu.items:                       flat gradient horizontal
-menu.items.color:               #d0d0d0
-menu.items.colorTo:             #a0a0a0
-menu.items.textColor:           #000010
-menu.disabled.textColor:        #777777
+menu.items.bg:                       flat gradient horizontal
+menu.items.bg.color:               #d0d0d0
+menu.items.bg.colorTo:             #a0a0a0
+menu.items.text.color:           #000010
+menu.items.disabled.text.color:        #777777
 !menu.frame.font:
 !menu.frame.justify:
 
-menu.selected:                      raised gradient horizontal
-menu.selected.color:              #d0d0d0
-menu.selected.colorTo:            #a0a0a0
-menu.selected.textColor:          #171777
+menu.items.active.bg:                      raised gradient horizontal
+menu.items.active.bg.color:              #d0d0d0
+menu.items.active.bg.colorTo:            #a0a0a0
+menu.items.active.text.color:          #171777
 
 
 
 !----------------------------------------------------------window------!
 
-window.title.focus:                         raised gradient vertical
-window.title.focus.color:                 #a0a0a0
-window.title.focus.colorTo:               #d0d0d0
+window.active.title.bg:                         raised gradient vertical
+window.active.title.bg.color:                 #a0a0a0
+window.active.title.bg.colorTo:               #d0d0d0
 
-window.title.unfocus:                       raised gradient vertical
-window.title.unfocus.color:               #808080
-window.title.unfocus.colorTo:             #a0a0a0
+window.inactive.title.bg:                       raised gradient vertical
+window.inactive.title.bg.color:               #808080
+window.inactive.title.bg.colorTo:             #a0a0a0
 
-window.label.focus:                         sunken gradient vertical interlaced
-window.label.focus.color:                 #202540
-window.label.focus.colorTo:               #304060
-window.label.focus.textColor:             #f0f0f7
+window.active.label.bg:                         sunken gradient vertical interlaced
+window.active.label.bg.color:                 #202540
+window.active.label.bg.colorTo:               #304060
+window.active.label.text.color:             #f0f0f7
 
-window.label.unfocus:                       sunken gradient vertical
-window.label.unfocus.color:               #505050
-window.label.unfocus.colorTo:             #808080
-window.label.unfocus.textColor:           #000000
+window.inactive.label.bg:                       sunken gradient vertical
+window.inactive.label.bg.color:               #505050
+window.inactive.label.bg.colorTo:             #808080
+window.inactive.label.text.color:           #000000
 
-window.handle.focus:                        raised gradient diagonal
-window.handle.focus.color:                #d0d0d0
-window.handle.focus.colorTo:              #a0a0a0
+window.active.handle.bg:                        raised gradient diagonal
+window.active.handle.bg.color:                #d0d0d0
+window.active.handle.bg.colorTo:              #a0a0a0
 
-window.handle.unfocus:                      raised gradient diagonal
-window.handle.unfocus.color:              #a0a0a0
-window.handle.unfocus.colorTo:            #808080
+window.inactive.handle.bg:                      raised gradient diagonal
+window.inactive.handle.bg.color:              #a0a0a0
+window.inactive.handle.bg.colorTo:            #808080
 
-window.grip.focus:                          raised gradient vertical
-window.grip.focus.color:                  #202540
-window.grip.focus.colorTo:                #304060
+window.active.grip.bg:                          raised gradient vertical
+window.active.grip.bg.color:                  #202540
+window.active.grip.bg.colorTo:                #304060
 
-window.grip.unfocus:                        raised gradient vertical
-window.grip.unfocus.color:                #202530
-window.grip.unfocus.colorTo:              #304050
+window.inactive.grip.bg:                        raised gradient vertical
+window.inactive.grip.bg.color:                #202530
+window.inactive.grip.bg.colorTo:              #304050
 
-window.button.focus:                        raised gradient vertical
-window.button.focus.color:                #a0a0a0
-window.button.focus.colorTo:              #d0d0d0
-window.button.focus.imageColor:             #000000
+window.active.button.unpressed.bg:                        raised gradient vertical
+window.active.button.unpressed.bg.color:                #a0a0a0
+window.active.button.unpressed.bg.colorTo:              #d0d0d0
+window.active.button.unpressed.image.color:             #000000
 
-window.button.unfocus:                      parentrelative
+window.inactive.button.unpressed.bg:                      parentrelative
 !window.button.unfocus.color:
 !window.button.unfocus.colorTo:
-window.button.unfocus.imageColor:           #000000
+window.inactive.button.unpressed.image.color:           #000000
 
-window.button.pressed.focus:                parentrelative
+window.active.button.pressed.bg:                parentrelative
 !window.button.pressed.focus.color:
 !window.button.pressed.focus.colorTo:
 
-window.button.pressed.unfocus:              sunken gradient vertical
-window.button.pressed.unfocus.color:      #808080
-window.button.pressed.unfocus.colorTo:    #a0a0a0
+window.inactive.button.pressed.bg:              sunken gradient vertical
+window.inactive.button.pressed.bg.color:      #808080
+window.inactive.button.pressed.bg.colorTo:    #a0a0a0
 
-window.button.disabled.focus:               raised gradient vertical
-window.button.disabled.focus.color:       #a0a0a0
-window.button.disabled.focus.colorTo:     #d0d0d0
-window.button.disabled.focus.imageColor:    #a0a0a0
+window.active.button.disabled.bg:               raised gradient vertical
+window.active.button.disabled.bg.color:       #a0a0a0
+window.active.button.disabled.bg.colorTo:     #d0d0d0
+window.active.button.disabled.image.color:    #a0a0a0
 
-window.button.disabled.unfocus:             parentrelative
-window.button.disabled.unfocus.imageColor:  #a0a0a0
+window.inactive.button.disabled.bg:             parentrelative
+window.inactive.button.disabled.image.color:  #a0a0a0
 
-window.frame.focusColor:                    #d0d0d0
-window.frame.unfocusColor:                #a0a0a0
+window.active.client.color:                    #d0d0d0
+window.inactive.client.color:                #a0a0a0
 
 !window.font:
 !window.justify:
@@ -105,14 +105,14 @@ window.frame.unfocusColor:                #a0a0a0
 
 !----------------------------------------------------------misc--------!
 
-borderWidth:  1
-borderColor:  #070707
+border.width:  1
+border.color:  #070707
 
-bevelWidth:   1
-handleWidth:  5
+padding.width:   1
+window.handle.width:  5
 
-menuOverlap: 0
-frameWidth: 1
+menu.overlap: 0
+window.client.padding.width: 1
 
 
 
diff --git a/themes/Artwiz/openbox-3/themerc b/themes/Artwiz/openbox-3/themerc
index 8e827626..acbbe621 100644
--- a/themes/Artwiz/openbox-3/themerc
+++ b/themes/Artwiz/openbox-3/themerc
@@ -1,101 +1,101 @@
-menu.title:			raised gradient diagonal
-menu.title.color:		rgb:90/94/98
-menu.title.colorTo:		rgb:20/24/28
-menu.title.textColor:		white
-menu.title.justify:		center
-
-menu.items:			sunken gradient diagonal
-menu.items.color:		rgb:10/20/30
-menu.items.colorTo:		rgb:70/80/90
-menu.items.textColor:		rgb:90/a0/b0
+menu.title.bg:			raised gradient diagonal
+menu.title.bg.color:		rgb:90/94/98
+menu.title.bg.colorTo:		rgb:20/24/28
+menu.title.text.color:		white
+menu.title.text.justify:		center
+
+menu.items.bg:			sunken gradient diagonal
+menu.items.bg.color:		rgb:10/20/30
+menu.items.bg.colorTo:		rgb:70/80/90
+menu.items.text.color:		rgb:90/a0/b0
 menu.items.justify:		center
 
-menu.selected:			raised gradient diagonal
-menu.selected.color:		rgb:90/94/98
-menu.selected.colorTo:		rgb:20/24/28
-menu.selected.textColor:		white
-menu.bullet.imageColor: rgb:90/a0/b0
-
-window.title.focus:		raised gradient vertical
-window.title.focus.color:	rgb:80/84/88
-window.title.focus.colorTo:	rgb:30/34/38
-window.title.unfocus:		raised vertical gradient
-window.title.unfocus.color:	rgb:50/54/58
-window.title.unfocus.colorTo:	black
-
-window.label.focus:		sunken diagonal gradient
-window.label.focus.color:	rgb:10/20/30
-window.label.focus.colorTo:	rgb:70/80/90
-window.label.focus.textColor:	white
-window.label.unfocus:		sunken gradient diagonal
-window.label.unfocus.color:	black
-window.label.unfocus.colorTo:	rgb:40/50/60
-window.label.unfocus.textColor:	rgb:60/64/68
-window.label.justify:			center
-
-window.button.focus:		raised gradient diagonal
-window.button.focus.color:	rgb:90/94/98
-window.button.focus.colorTo:	rgb:20/24/28
-window.button.focus.imageColor:	white
-
-window.button.unfocus:		raised gradient diagonal
-window.button.unfocus.color:	rgb:50/54/58
-window.button.unfocus.colorTo:	black
-window.button.unfocus.imageColor:	rgb:70/74/78
-
-window.button.pressed.focus:		sunken gradient diagonal
-window.button.pressed.focus.color:	rgb:20/40/50
-window.button.pressed.focus.colorTo:	rgb:60/70/80
-
-window.button.pressed.unfocus:		sunken gradient diagonal
-window.button.pressed.unfocus.color:	rgb:50/54/58
-window.button.pressed.unfocus.colorTo:	black
-window.button.pressed.unfocus.imageColor:	rgb:70/74/78
-
-window.frame.focusColor:	rgb:40/44/48
-window.frame.unfocusColor:	rgb:20/24/28
-
-window.handle.focus:		raised gradient diagonal
-window.handle.focus.color:	rgb:70/74/78
-window.handle.focus.colorTo:	rgb:40/44/48
-
-window.handle.unfocus:		raised gradient diagonal
-window.handle.unfocus.color:	rgb:50/54/58
-window.handle.unfocus.colorTo:	black
-
-window.grip.focus:		sunken diagonal gradient
-window.grip.focus.color:	rgb:20/30/40
-window.grip.focus.colorTo:	rgb:60/70/80
-
-window.grip.unfocus:		sunken diagonal gradient
-window.grip.unfocus.color:	black
-window.grip.unfocus.colorTo:	rgb:30/40/50
-
-window.button.toggled.focus:		raised gradient diagonal
-window.button.toggled.focus.color:	rgb:90/94/98
-window.button.toggled.focus.colorTo:	rgb:20/24/28
-window.button.toggled.focus.imageColor:	white
-
-window.button.toggled.unfocus:		raised gradient diagonal
-window.button.toggled.unfocus.color:	rgb:50/54/58
-window.button.toggled.unfocus.colorTo:	black
-window.button.toggled.unfocus.imageColor:	rgb:70/74/78
-
-window.button.disabled.focus:		raised gradient diagonal
-window.button.disabled.focus.color:	rgb:90/94/98
-window.button.disabled.focus.colorTo:	rgb:20/24/28
-window.button.disabled.focus.imageColor:	grey
-
-window.button.disabled.unfocus:		raised gradient diagonal
-window.button.disabled.unfocus.color:	rgb:50/54/58
-window.button.disabled.unfocus.colorTo:	black
-window.button.disabled.unfocus.imageColor:	rgb:70/74/78
-
-borderColor:			black
-bevelWidth:				1
+menu.items.active.bg:			raised gradient diagonal
+menu.items.active.bg.color:		rgb:90/94/98
+menu.items.active.bg.colorTo:		rgb:20/24/28
+menu.items.active.text.color:		white
+menu.bullet.image.color: rgb:90/a0/b0
+
+window.active.title.bg:		raised gradient vertical
+window.active.title.bg.color:	rgb:80/84/88
+window.active.title.bg.colorTo:	rgb:30/34/38
+window.inactive.title.bg:		raised vertical gradient
+window.inactive.title.bg.color:	rgb:50/54/58
+window.inactive.title.bg.colorTo:	black
+
+window.active.label.bg:		sunken diagonal gradient
+window.active.label.bg.color:	rgb:10/20/30
+window.active.label.bg.colorTo:	rgb:70/80/90
+window.active.label.text.color:	white
+window.inactive.label.bg:		sunken gradient diagonal
+window.inactive.label.bg.color:	black
+window.inactive.label.bg.colorTo:	rgb:40/50/60
+window.inactive.label.text.color:	rgb:60/64/68
+window.label.text.justify:			center
+
+window.active.button.unpressed.bg:		raised gradient diagonal
+window.active.button.unpressed.bg.color:	rgb:90/94/98
+window.active.button.unpressed.bg.colorTo:	rgb:20/24/28
+window.active.button.unpressed.image.color:	white
+
+window.inactive.button.unpressed.bg:		raised gradient diagonal
+window.inactive.button.unpressed.bg.color:	rgb:50/54/58
+window.inactive.button.unpressed.bg.colorTo:	black
+window.inactive.button.unpressed.image.color:	rgb:70/74/78
+
+window.active.button.pressed.bg:		sunken gradient diagonal
+window.active.button.pressed.bg.color:	rgb:20/40/50
+window.active.button.pressed.bg.colorTo:	rgb:60/70/80
+
+window.inactive.button.pressed.bg:		sunken gradient diagonal
+window.inactive.button.pressed.bg.color:	rgb:50/54/58
+window.inactive.button.pressed.bg.colorTo:	black
+window.inactive.button.pressed.image.color:	rgb:70/74/78
+
+window.active.client.color:	rgb:40/44/48
+window.inactive.client.color:	rgb:20/24/28
+
+window.active.handle.bg:		raised gradient diagonal
+window.active.handle.bg.color:	rgb:70/74/78
+window.active.handle.bg.colorTo:	rgb:40/44/48
+
+window.inactive.handle.bg:		raised gradient diagonal
+window.inactive.handle.bg.color:	rgb:50/54/58
+window.inactive.handle.bg.colorTo:	black
+
+window.active.grip.bg:		sunken diagonal gradient
+window.active.grip.bg.color:	rgb:20/30/40
+window.active.grip.bg.colorTo:	rgb:60/70/80
+
+window.inactive.grip.bg:		sunken diagonal gradient
+window.inactive.grip.bg.color:	black
+window.inactive.grip.bg.colorTo:	rgb:30/40/50
+
+window.active.button.toggled.bg:		raised gradient diagonal
+window.active.button.toggled.bg.color:	rgb:90/94/98
+window.active.button.toggled.bg.colorTo:	rgb:20/24/28
+window.active.button.toggled.image.color:	white
+
+window.inactive.button.toggled.bg:		raised gradient diagonal
+window.inactive.button.toggled.bg.color:	rgb:50/54/58
+window.inactive.button.toggled.bg.colorTo:	black
+window.inactive.button.toggled.image.color:	rgb:70/74/78
+
+window.active.button.disabled.bg:		raised gradient diagonal
+window.active.button.disabled.bg.color:	rgb:90/94/98
+window.active.button.disabled.bg.colorTo:	rgb:20/24/28
+window.active.button.disabled.image.color:	grey
+
+window.inactive.button.disabled.bg:		raised gradient diagonal
+window.inactive.button.disabled.bg.color:	rgb:50/54/58
+window.inactive.button.disabled.bg.colorTo:	black
+window.inactive.button.disabled.image.color:	rgb:70/74/78
+
+border.color:			black
+padding.width:				1
 borderWidth:			1
-handleWidth:			4
+window.handle.width:			4
 
-window.label.focus.font: Bitstream Vera Sans:pixelsize=10
-menu.title.font: Bitstream Vera Sans:pixelsize=10
+window.active.label.text.font: Bitstream Vera Sans:pixelsize=10
+menu.title.text.font: Bitstream Vera Sans:pixelsize=10
 menu.items.font: Bitstream Vera Sans:pixelsize=10
diff --git a/themes/Blah41/openbox-3/themerc b/themes/Blah41/openbox-3/themerc
index a054b3d6..9d2a5a42 100644
--- a/themes/Blah41/openbox-3/themerc
+++ b/themes/Blah41/openbox-3/themerc
@@ -1,117 +1,117 @@
 ! blah41
 
 ! ***** menu *****
-menu.title:				flat gradient vertical border
-menu.title.color:			#718497
-menu.title.colorTo:			#465a6e
-menu.title.textColor:		#e9e9e9
-menu.title.borderColor:		#a7aaad
-
-menu.items:				flat gradient horizontal border
-menu.items.color:			#bcbfc3
-menu.items.colorTo:			#a0a3a6
-menu.items.textColor:		#000000
-menu.items.borderColor:		#a7aaad
-menu.disabled.textColor:		#6c757d
-
-menu.selected:				flat gradient vertical border
-menu.selected.color:			#a7aaad
-menu.selected.colorTo:		#a7aaad
-menu.selected.textColor:		#000000
-menu.selected.borderColor:		#808285
+menu.title.bg:				flat gradient vertical border
+menu.title.bg.color:			#718497
+menu.title.bg.colorTo:			#465a6e
+menu.title.text.color:		#e9e9e9
+menu.title.bg.border.color:		#a7aaad
+
+menu.items.bg:				flat gradient horizontal border
+menu.items.bg.color:			#bcbfc3
+menu.items.bg.colorTo:			#a0a3a6
+menu.items.text.color:		#000000
+menu.items.bg.border.color:		#a7aaad
+menu.items.disabled.text.color:		#6c757d
+
+menu.items.active.bg:				flat gradient vertical border
+menu.items.active.bg.color:			#a7aaad
+menu.items.active.bg.colorTo:		#a7aaad
+menu.items.active.text.color:		#000000
+menu.items.active.bg.border.color:		#808285
 
 menu.bullet.position:		right
 
 
 ! ***** window focused *****
-window.title.focus:			flat gradient vertical
-window.title.focus.color:		#a7aaad
-window.title.focus.colorTo:		#808285
-window.title.focus.borderColor:	#a7aaad
+window.active.title.bg:			flat gradient vertical
+window.active.title.bg.color:		#a7aaad
+window.active.title.bg.colorTo:		#808285
+window.active.title.bg.border.color:	#a7aaad
 
-window.label.focus:			flat gradient vertical border
-window.label.focus.color:		#718497
-window.label.focus.colorTo:		#465a6e
-window.label.focus.textColor:	#e9e9e9
-window.label.focus.borderColor:	#2e3a45
+window.active.label.bg:			flat gradient vertical border
+window.active.label.bg.color:		#718497
+window.active.label.bg.colorTo:		#465a6e
+window.active.label.text.color:	#e9e9e9
+window.active.label.bg.border.color:	#2e3a45
 
-window.button.focus:			parentrelative
-window.button.focus.color:		#a7aaad
-window.button.focus.colorTo:	#808285
-window.button.focus.imageColor:	#555c62
-window.button.focus.borderColor:	#555c62
+window.active.button.unpressed.bg:			parentrelative
+window.active.button.unpressed.bg.color:		#a7aaad
+window.active.button.unpressed.bg.colorTo:	#808285
+window.active.button.unpressed.image.color:	#555c62
+window.active.button.unpressed.bg.border.color:	#555c62
 
-window.button.pressed.focus:		flat gradient vertical border
-window.button.pressed.focus.color:	#bcbfc3
-window.button.pressed.focus.colorTo:#a0a3a6
-window.button.pressed.focus.borderColor:	#45525f
-window.button.pressed.focus.imageColor:	#000000
+window.active.button.pressed.bg:		flat gradient vertical border
+window.active.button.pressed.bg.color:	#bcbfc3
+window.active.button.pressed.bg.colorTo:#a0a3a6
+window.active.button.pressed.bg.border.color:	#45525f
+window.active.button.pressed.image.color:	#000000
 
-window.button.disabled.focus:		parentrelative
-window.button.disabled.focus.imageColor:	#7a7f86
+window.active.button.disabled.bg:		parentrelative
+window.active.button.disabled.image.color:	#7a7f86
 
-window.handle.focus:			flat gradient vertical
-window.handle.focus.color:		#718497
-window.handle.focus.colorTo:	#45525f
+window.active.handle.bg:			flat gradient vertical
+window.active.handle.bg.color:		#718497
+window.active.handle.bg.colorTo:	#45525f
 
-window.grip.focus:			flat gradient vertical
-window.grip.focus.color:		#a7aaad
-window.grip.focus.colorTo:		#808285
-window.grip.focus.borderColor:	#a7aaad
+window.active.grip.bg:			flat gradient vertical
+window.active.grip.bg.color:		#a7aaad
+window.active.grip.bg.colorTo:		#808285
+window.active.grip.bg.border.color:	#a7aaad
 
-window.frame.focusColor:		#a7aaad
+window.active.client.color:		#a7aaad
 
 
 ! ***** window unfocused *****
-window.title.unfocus:			flat gradient vertical
-window.title.unfocus.color:		#a7aaad
-window.title.unfocus.colorTo:	#808285
+window.inactive.title.bg:			flat gradient vertical
+window.inactive.title.bg.color:		#a7aaad
+window.inactive.title.bg.colorTo:	#808285
 
-window.label.unfocus:			flat gradient vertical border
-window.label.unfocus.color:		#bcbfc3
-window.label.unfocus.colorTo:	#a0a3a6
-window.label.unfocus.textColor:	#555c62
-window.label.unfocus.borderColor:	#555c62
+window.inactive.label.bg:			flat gradient vertical border
+window.inactive.label.bg.color:		#bcbfc3
+window.inactive.label.bg.colorTo:	#a0a3a6
+window.inactive.label.text.color:	#555c62
+window.inactive.label.bg.border.color:	#555c62
 
-window.button.unfocus:			parentrelative
-window.button.unfocus.color:	#a7aaad
-window.button.unfocus.colorTo:	#a7aaad
-window.button.unfocus.imageColor:	#555c62
-!    window.button.unfocus.borderColor:	#555c62
+window.inactive.button.unpressed.bg:			parentrelative
+window.inactive.button.unpressed.bg.color:	#a7aaad
+window.inactive.button.unpressed.bg.colorTo:	#a7aaad
+window.inactive.button.unpressed.image.color:	#555c62
+!    window.inactive.button.unpressed.bg.border.color:	#555c62
 
-window.button.pressed.unfocus:		flat gradient vertical border
-window.button.pressed.unfocus.color:	#a7aaad
-window.button.pressed.unfocus.colorTo:	#808285
-window.button.pressed.unfocus.borderColor:#555c62
+window.inactive.button.pressed.bg:		flat gradient vertical border
+window.inactive.button.pressed.bg.color:	#a7aaad
+window.inactive.button.pressed.bg.colorTo:	#808285
+window.inactive.button.pressed.bg.border.color:#555c62
 
-window.button.disabled.unfocus:		parentrelative
-window.button.disabled.unfocus.imageColor:	#7a7f86
+window.inactive.button.disabled.bg:		parentrelative
+window.inactive.button.disabled.image.color:	#7a7f86
 
-window.handle.unfocus:			flat solid
-window.handle.unfocus.color:	#a7aaad
-window.handle.unfocus.colorTo:	#b4b4ae
+window.inactive.handle.bg:			flat solid
+window.inactive.handle.bg.color:	#a7aaad
+window.inactive.handle.bg.colorTo:	#b4b4ae
 
-window.grip.unfocus:			flat gradient vertical
-window.grip.unfocus.color:		#a7aaad
-window.grip.unfocus.colorTo:	#808285
-window.grip.unfocus.borderColor:	#555c62
+window.inactive.grip.bg:			flat gradient vertical
+window.inactive.grip.bg.color:		#a7aaad
+window.inactive.grip.bg.colorTo:	#808285
+window.inactive.grip.bg.border.color:	#555c62
 
-window.frame.unfocusColor:		#a7aaad
+window.inactive.client.color:		#a7aaad
 
 
 ! ***** fonts *****
 
-window.label.focus.font:   trebuchet ms:bold:pixelsize=10:shadow=y:shadowtint=12:shadowoffset=2
-menu.title.font:     trebuchet ms:bold:pixelsize=11:shadow=y:shadowtint=12:shadowoffset=2
+window.active.label.text.font:   trebuchet ms:bold:pixelsize=10:shadow=y:shadowtint=12:shadowoffset=2
+menu.title.text.font:     trebuchet ms:bold:pixelsize=11:shadow=y:shadowtint=12:shadowoffset=2
 menu.items.font:     trebuchet ms:pixelsize=12
 
-window.label.justify:			center
-menu.title.justify:		center
+window.label.text.justify:			center
+menu.title.text.justify:		center
 
 
 ! ***** the rest *****
-borderColor:				#2e3a45
+border.color:				#2e3a45
 borderWidth:				1
-bevelWidth:				1
-handleWidth:				3
-frameWidth:				1
+padding.width:				1
+window.handle.width:				3
+window.client.padding.width:				1
diff --git a/themes/Om4Ob/openbox-3/themerc b/themes/Om4Ob/openbox-3/themerc
index 9d2c5cde..5899e499 100644
--- a/themes/Om4Ob/openbox-3/themerc
+++ b/themes/Om4Ob/openbox-3/themerc
@@ -1,105 +1,105 @@
 style.author:	miklos
 style.date:	Aug 1, 2003
 
-window.label.focus.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
-menu.title.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
+window.active.label.text.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
+menu.title.text.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
 menu.items.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
 
 
 ! Menu settings...
-menu.items: flat gradient crossdiagonal
-menu.items.colorTo:	#93a1a8
-menu.items.color:	#7c8c93
-menu.items.borderColor: #ffffff
-menu.items.textColor:	#4c595c
+menu.items.bg: flat gradient crossdiagonal
+menu.items.bg.colorTo:	#93a1a8
+menu.items.bg.color:	#7c8c93
+menu.items.bg.border.color: #ffffff
+menu.items.text.color:	#4c595c
 
 menu.items.justify:	center
-menu.title.justify:  right
+menu.title.text.justify:  right
 
-menu.title:	flatborder gradient diagonal
-menu.title.colorTo:	#757575
-menu.title.color:	#f0f0ff
-menu.title.borderColor:	#a9a9a9
-menu.title.textColor:	#565a5c
+menu.title.bg:	flatborder gradient diagonal
+menu.title.bg.colorTo:	#757575
+menu.title.bg.color:	#f0f0ff
+menu.title.bg.border.color:	#a9a9a9
+menu.title.text.color:	#565a5c
 
-menu.selected: flatborder gradient diagonal
-menu.selected.color: #93a1a8
-menu.selected.colorTo: #7c8c93
-menu.selected.borderColor: #a9a9a9
-menu.selected.textColor:	#f0f0ff
+menu.items.active.bg: flatborder gradient diagonal
+menu.items.active.bg.color: #93a1a8
+menu.items.active.bg.colorTo: #7c8c93
+menu.items.active.bg.border.color: #a9a9a9
+menu.items.active.text.color:	#f0f0ff
 
-menu.disabled.textColor:	#757575
+menu.items.disabled.text.color:	#757575
 
 ! Window settings...
-window.button.focus: parentrelative
-window.button.focus.imageColor: #565a5c
+window.active.button.unpressed.bg: parentrelative
+window.active.button.unpressed.image.color: #565a5c
 
-window.label.justify: center
+window.label.text.justify: center
 
-window.button.hover.focus: flatborder gradient diagonal
-window.button.hover.focus.color: #93a1a8
-window.button.hover.focus.colorTo: #7c8c93
-window.button.hover.focus.borderColor: #a9a9a9
-window.button.hover.focus.imageColor: #ffffff
+window.active.button.hover.bg: flatborder gradient diagonal
+window.active.button.hover.bg.color: #93a1a8
+window.active.button.hover.bg.colorTo: #7c8c93
+window.active.button.hover.bg.border.color: #a9a9a9
+window.active.button.hover.image.color: #ffffff
 
-window.button.hover.unfocus: parentrelative
+window.inactive.button.hover.bg: parentrelative
 
-window.button.toggled.focus: flatborder gradient diagonal
-window.button.toggled.focus.color: #93a1a8
-window.button.toggled.focus.colorTo: #7c8c93
-window.button.toggled.focus.borderColor: #a9a9a9
-window.button.toggled.focus.imageColor: #ffffff
+window.active.button.toggled.bg: flatborder gradient diagonal
+window.active.button.toggled.bg.color: #93a1a8
+window.active.button.toggled.bg.colorTo: #7c8c93
+window.active.button.toggled.bg.border.color: #a9a9a9
+window.active.button.toggled.image.color: #ffffff
 
-window.button.toggled.unfocus: parentrelative
+window.inactive.button.toggled.bg: parentrelative
 
-window.button.pressed.focus: sunken gradient diagonal
-window.button.pressed.focus.color: #93a1a8
-window.button.pressed.focus.colorTo: #7c8c93
-window.button.pressed.focus.imageColor: #ffffff
+window.active.button.pressed.bg: sunken gradient diagonal
+window.active.button.pressed.bg.color: #93a1a8
+window.active.button.pressed.bg.colorTo: #7c8c93
+window.active.button.pressed.image.color: #ffffff
 
-window.button.disabled.focus: parentrelative
-window.button.disabled.focus.imageColor: #7c8c93
-window.button.disabled.unfocus: parentrelative
-window.button.disabled.unfocus.imageColor: #7c8c93
+window.active.button.disabled.bg: parentrelative
+window.active.button.disabled.image.color: #7c8c93
+window.inactive.button.disabled.bg: parentrelative
+window.inactive.button.disabled.image.color: #7c8c93
 
-window.button.unfocus: parentrelative
-window.button.unfocus.imageColor: #677b91
+window.inactive.button.unpressed.bg: parentrelative
+window.inactive.button.unpressed.image.color: #677b91
 
-window.grip.focus:	flat gradient diagonal
-window.grip.focus.color:	#93a1a8
-window.grip.focus.colorTo:	#7c8c93
+window.active.grip.bg:	flat gradient diagonal
+window.active.grip.bg.color:	#93a1a8
+window.active.grip.bg.colorTo:	#7c8c93
 
-window.grip.unfocus: flat solid
-window.grip.unfocus.color: #7c8c93
+window.inactive.grip.bg: flat solid
+window.inactive.grip.bg.color: #7c8c93
 
-window.handle.focus:	raised gradient diagonal
-window.handle.focus.colorTo:	#757575
-window.handle.focus.color:	#f0f0ff
+window.active.handle.bg:	raised gradient diagonal
+window.active.handle.bg.colorTo:	#757575
+window.active.handle.bg.color:	#f0f0ff
 
-window.handle.unfocus:	flat solid
-window.handle.unfocus.color:	#7c8c93
+window.inactive.handle.bg:	flat solid
+window.inactive.handle.bg.color:	#7c8c93
 
-window.label.focus:	flatborder gradient diagonal
-window.label.focus.color:  #f0f0ff
-window.label.focus.colorTo:  #757575
-window.label.focus.borderColor: #565a5c
-window.label.focus.textColor:  #262a2c
+window.active.label.bg:	flatborder gradient diagonal
+window.active.label.bg.color:  #f0f0ff
+window.active.label.bg.colorTo:  #757575
+window.active.label.bg.border.color: #565a5c
+window.active.label.text.color:  #262a2c
 
-window.label.unfocus:	parentrelative
-window.label.unfocus.textColor: #565a5c
+window.inactive.label.bg:	parentrelative
+window.inactive.label.text.color: #565a5c
 
-window.title.focus: flat gradient vertical
-window.title.focus.color:     #93a1a8
-window.title.focus.colorTo:       #7c8c93
+window.active.title.bg: flat gradient vertical
+window.active.title.bg.color:     #93a1a8
+window.active.title.bg.colorTo:       #7c8c93
 
-window.title.unfocus:	flat gradient crossdiagonal
-window.title.unfocus.color:	#93a1a8
-window.title.unfocus.colorTo:	#7c8c93
+window.inactive.title.bg:	flat gradient crossdiagonal
+window.inactive.title.bg.color:	#93a1a8
+window.inactive.title.bg.colorTo:	#7c8c93
 
-window.frame.focusColor:	#7c8c93
-window.frame.unfocusColor:	#677b91
-handleWidth:	3
-frameWidth:	1
-bevelWidth:	1
+window.active.client.color:	#7c8c93
+window.inactive.client.color:	#677b91
+window.handle.width:	3
+window.client.padding.width:	1
+padding.width:	1
 borderWidth:	1
-borderColor:	#484848
+border.color:	#484848
diff --git a/themes/TheBear/openbox-3/themerc b/themes/TheBear/openbox-3/themerc
index ca8cd5b3..200f22a7 100644
--- a/themes/TheBear/openbox-3/themerc
+++ b/themes/TheBear/openbox-3/themerc
@@ -1,111 +1,109 @@
 !! Menu settings
 
-menu.title: flat gradient vertical bevel1
-menu.title.color: #5a6dc5
-menu.title.colorTo: #4a59a5
-menu.title.textColor: #fcfcfe
-menu.title.justify: center
-
-menu.items: raised solid bevel1
-menu.items.color: #e6e6e6
-menu.items.colorTo: #000000
-menu.items.textColor: #000000
+menu.title.bg: flat gradient vertical bevel1
+menu.title.bg.color: #5a6dc5
+menu.title.bg.colorTo: #4a59a5
+menu.title.text.color: #fcfcfe
+menu.title.text.justify: center
+
+menu.items.bg: raised solid bevel1
+menu.items.bg.color: #e6e6e6
+menu.items.bg.colorTo: #000000
+menu.items.text.color: #000000
 menu.items.justify: left
-menu.disabled.textColor: #737573
+menu.items.disabled.text.color: #737573
 
-menu.selected: flat gradient vertical bevel1
-menu.selected.color: #4a5194
-menu.selected.colorTo: #5a71c5
-menu.selected.textColor: #ffffff
-menu.bullet.imageColor: #000000
-menu.bullet.selected.imageColor: #ffffff
+menu.items.active.bg: flat gradient vertical bevel1
+menu.items.active.bg.color: #4a5194
+menu.items.active.bg.colorTo: #5a71c5
+menu.items.active.text.color: #ffffff
 
-menuOverlap: 5
+menu.overlap: 5
 
-window.label.justify: center
+window.label.text.justify: center
 
-window.title.focus: flat gradient vertical bevel1
-window.title.focus.color: #6375ce
-window.title.focus.colorTo: #4a5194
+window.active.title.bg: flat gradient vertical bevel1
+window.active.title.bg.color: #6375ce
+window.active.title.bg.colorTo: #4a5194
 
-window.handle.focus:  flat gradient vertical bevel1
-window.handle.focus.color: #6375ce
-window.handle.focus.colorTo: #4a5194
+window.active.handle.bg:  flat gradient vertical bevel1
+window.active.handle.bg.color: #6375ce
+window.active.handle.bg.colorTo: #4a5194
 
-window.grip.focus:  flat gradient vertical bevel1
-window.grip.focus.color: #6375ce
-window.grip.focus.colorTo: #4a5194
+window.active.grip.bg:  flat gradient vertical bevel1
+window.active.grip.bg.color: #6375ce
+window.active.grip.bg.colorTo: #4a5194
 
-window.label.focus: parentrelative
-window.label.focus.color: #000000
-window.label.focus.colorTo: #000000
-window.label.focus.textColor: #ffffff
+window.active.label.bg: parentrelative
+window.active.label.bg.color: #000000
+window.active.label.bg.colorTo: #000000
+window.active.label.text.color: #ffffff
 
-window.button.focus: parentrelative
-window.button.focus.color: #000000
-window.button.focus.colorTo: #000000
-window.button.focus.imageColor: #d6d7ef
+window.active.button.unpressed.bg: parentrelative
+window.active.button.unpressed.bg.color: #000000
+window.active.button.unpressed.bg.colorTo: #000000
+window.active.button.unpressed.image.color: #d6d7ef
 
-window.button.pressed.focus: sunken solid bevel1
-window.button.pressed.focus.color: #4c59a6
-window.button.pressed.focus.colorTo: #000000
+window.active.button.pressed.bg: sunken solid bevel1
+window.active.button.pressed.bg.color: #4c59a6
+window.active.button.pressed.bg.colorTo: #000000
 
-window.title.unfocus: flat gradient vertical bevel1
-window.title.unfocus.color: #e1e1e1
-window.title.unfocus.colorTo: #a5a2a5
+window.inactive.title.bg: flat gradient vertical bevel1
+window.inactive.title.bg.color: #e1e1e1
+window.inactive.title.bg.colorTo: #a5a2a5
 
-window.handle.unfocus:  flat gradient vertical bevel1
-window.handle.unfocus.color: #e6e6e6
-window.handle.unfocus.colorTo: #cdcac7
+window.inactive.handle.bg:  flat gradient vertical bevel1
+window.inactive.handle.bg.color: #e6e6e6
+window.inactive.handle.bg.colorTo: #cdcac7
 
-window.grip.unfocus: flat gradient vertical bevel1
-window.grip.unfocus.color: #e6e6e6
-window.grip.unfocus.colorTo: #cdcac7
+window.inactive.grip.bg: flat gradient vertical bevel1
+window.inactive.grip.bg.color: #e6e6e6
+window.inactive.grip.bg.colorTo: #cdcac7
 
-window.label.unfocus: parentrelative
-window.label.unfocus.textColor: #ffffff
+window.inactive.label.bg: parentrelative
+window.inactive.label.text.color: #ffffff
 
-window.button.unfocus: parentrelative
-window.button.unfocus.imageColor: #ffffff
+window.inactive.button.unpressed.bg: parentrelative
+window.inactive.button.unpressed.image.color: #ffffff
 
-window.button.pressed.unfocus: sunken solidbevel1
-window.button.pressed.unfocus.color: #cdcac7
-window.button.pressed.unfocus.colorTo: #000000
+window.inactive.button.pressed.bg: sunken solidbevel1
+window.inactive.button.pressed.bg.color: #cdcac7
+window.inactive.button.pressed.bg.colorTo: #000000
 
-window.button.pressed.unfocus: flat gradient vertical bevel1
-window.button.pressed.unfocus.color: #919191
-window.button.pressed.unfocus.colorTo: #5a5a5a
-window.button.pressed.unfocus.borderColor: #000000
+window.inactive.button.pressed.bg: flat gradient vertical bevel1
+window.inactive.button.pressed.bg.color: #919191
+window.inactive.button.pressed.bg.colorTo: #5a5a5a
+window.inactive.button.pressed.bg.border.color: #000000
 
 !#
-window.button.disabled.focus: parentrelative
-window.button.disabled.focus.imageColor: #dddddd
+window.active.button.disabled.bg: parentrelative
+window.active.button.disabled.image.color: #dddddd
 !#
-window.button.disabled.unfocus: parentrelative
-window.button.disabled.unfocus.imageColor:  #6a716a
+window.inactive.button.disabled.bg: parentrelative
+window.inactive.button.disabled.image.color:  #6a716a
 
 !# toggled
-window.button.toggled.focus: parentrelative
-window.button.toggled.focus.imageColor: #f1f1f1
+window.active.button.toggled.bg: parentrelative
+window.active.button.toggled.image.color: #f1f1f1
 
-window.button.toggled.unfocus: parentrelative
-window.button.toggled.focus.imageColor: #f1f1f1
+window.inactive.button.toggled.bg: parentrelative
+window.active.button.toggled.image.color: #f1f1f1
 
-window.frame.unfocusColor: #e6e6e6
-window.frame.focusColor: #e6e6e6
+window.inactive.client.color: #e6e6e6
+window.active.client.color: #e6e6e6
 
 !! Global width settings
-borderWidth: 1
-bevelWidth: 1
-handleWidth: 3
-frameWidth: 0
+border.width: 1
+padding.width: 1
+window.handle.width: 3
+window.client.padding.width: 0
 
 
 !! Miscellaneous settings
-borderColor: #222222
+border.color: #222222
 
 !! font me!
-window.label.focus.font:Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowoffset=1:shadowtint=75
-window.label.unfocus.font:Bitstream Vera Sans:bold:pixelsize=9
+window.active.label.text.font:Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowoffset=1:shadowtint=75
+window.inactive.label.text.font:Bitstream Vera Sans:bold:pixelsize=9
 menu.items.font: Bitstream Vera Sans:pixelsize=10
-menu.title.font: Bitstream Vera Sans:bold:pixelsize=10
+menu.title.text.font: Bitstream Vera Sans:bold:pixelsize=10