addign stuff.

addign stuff.

11 files changed, 268 insertions, 161 deletions

diff --git a/themes/theme_data/config b/themes/theme_data/config
index 99a7ab43be..81dc94c37c 100644
--- a/themes/theme_data/config
+++ b/themes/theme_data/config
@@ -9,283 +9,390 @@
 # button cannot|can|has_default normal|active|prelight|selected|insensitive
 # no_focus|focus background %s ....
 
-button 0 0 0 padding                4  4  4  4
-button 0 0 0 background image       pix/btn2.xpm
+window padding                      4  4  4  4
+window minimums                     8  8
+window background image             pix/b_full.png
+window background color             128 128 128
+window background border            4  4  4  4
+window background scale             1
+window background parent_tile       0
+
+button 0 0 0 padding                17  4  4  6
+button 0 0 0 minimums               30  28
+button 0 0 0 background image       pix/b_out.png
 button 0 0 0 background color       128 128 128
-button 0 0 0 background border      4  4  4  4
+button 0 0 0 background border      6  3  5  5
 button 0 0 0 background scale       1
 button 0 0 0 background parent_tile 0
+button 0 0 0 decoration image       pix/d1_n.png
+button 0 0 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 0 0 decoration image       pix/d2_n.png
+button 0 0 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 1 0 padding                4  4  4  4
-button 0 1 0 background image       pix/btn3.xpm
+button 0 1 0 padding                17  4  4  6
+button 0 1 0 minimums               30  28
+button 0 1 0 background image       pix/b_in.png
 button 0 1 0 background color       128 128 128
-button 0 1 0 background border      4  4  4  4
+button 0 1 0 background border      6  3  5  5
 button 0 1 0 background scale       1
 button 0 1 0 background parent_tile 0
+button 0 1 0 decoration image       pix/d1_h.png
+button 0 1 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 1 0 decoration image       pix/d2_h.png
+button 0 1 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 2 0 padding                4  4  4  4
-button 0 2 0 background image       pix/btn1.xpm
+button 0 2 0 padding                17  4  4  6
+button 0 2 0 minimums               30  28
+button 0 2 0 background image       pix/b_out.png
 button 0 2 0 background color       128 128 128
-button 0 2 0 background border      4  4  4  4
+button 0 2 0 background border      6  3  5  5
 button 0 2 0 background scale       1
 button 0 2 0 background parent_tile 0
+button 0 2 0 decoration image       pix/d1_h.png
+button 0 2 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 2 0 decoration image       pix/d2_h.png
+button 0 2 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 3 0 padding                4  4  4  4
-button 0 3 0 background image       pix/btn1.xpm
+button 0 3 0 padding                17  4  4  6
+button 0 3 0 minimums               30  28
+button 0 3 0 background image       pix/b_out.png
 button 0 3 0 background color       128 128 128
-button 0 3 0 background border      4  4  4  4
+button 0 3 0 background border      6  3  5  5
 button 0 3 0 background scale       1
 button 0 3 0 background parent_tile 0
+button 0 3 0 decoration image       pix/d1_h.png
+button 0 3 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 3 0 decoration image       pix/d2_h.png
+button 0 3 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 4 0 padding                4  4  4  4
-button 0 4 0 background image       pix/btn2.xpm
+button 0 4 0 padding                17  4  4  6
+button 0 4 0 minimums               30  28
+button 0 4 0 background image       pix/b_out.png
 button 0 4 0 background color       128 128 128
-button 0 4 0 background border      4  4  4  4
+button 0 4 0 background border      6  3  5  5
 button 0 4 0 background scale       1
 button 0 4 0 background parent_tile 0
+button 0 4 0 decoration image       pix/d1_d.png
+button 0 4 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 4 0 decoration image       pix/d2_d.png
+button 0 4 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 0 1 padding                4  4  4  4
-button 0 0 1 background image       pix/btn2.xpm
+button 0 0 1 padding                17  4  4  6
+button 0 0 1 minimums               30  28
+button 0 0 1 background image       pix/b_out.png
 button 0 0 1 background color       128 128 128
-button 0 0 1 background border      4  4  4  4
+button 0 0 1 background border      6  3  5  5
 button 0 0 1 background scale       1
 button 0 0 1 background parent_tile 0
-button 0 0 1 border     image       pix/brd1.xpm
-button 0 0 1 border     border      4  4  4  4
+button 0 0 1 decoration image       pix/d1_n.png
+button 0 0 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 0 1 decoration image       pix/d2_n.png
+button 0 0 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 1 1 padding                4  4  4  4
-button 0 1 1 background image       pix/btn3.xpm
+button 0 1 1 padding                17  4  4  6
+button 0 1 1 minimums               30  28
+button 0 1 1 background image       pix/b_in.png
 button 0 1 1 background color       128 128 128
-button 0 1 1 background border      4  4  4  4
+button 0 1 1 background border      6  3  5  5
 button 0 1 1 background scale       1
 button 0 1 1 background parent_tile 0
-button 0 1 1 border     image       pix/brd1.xpm
-button 0 1 1 border     border      4  4  4  4
+button 0 1 1 decoration image       pix/d1_h.png
+button 0 1 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 1 1 decoration image       pix/d2_h.png
+button 0 1 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 2 1 padding                4  4  4  4
-button 0 2 1 background image       pix/btn1.xpm
+button 0 2 1 padding                17  4  4  6
+button 0 2 1 minimums               30  28
+button 0 2 1 background image       pix/b_out.png
 button 0 2 1 background color       128 128 128
-button 0 2 1 background border      4  4  4  4
+button 0 2 1 background border      6  3  5  5
 button 0 2 1 background scale       1
 button 0 2 1 background parent_tile 0
-button 0 2 1 border     image       pix/brd1.xpm
-button 0 2 1 border     border      4  4  4  4
+button 0 2 1 decoration image       pix/d1_h.png
+button 0 2 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 2 1 decoration image       pix/d2_h.png
+button 0 2 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 3 1 padding                4  4  4  4
-button 0 3 1 background image       pix/btn1.xpm
+button 0 3 1 padding                17  4  4  6
+button 0 3 1 minimums               30  28
+button 0 3 1 background image       pix/b_out.png
 button 0 3 1 background color       128 128 128
-button 0 3 1 background border      4  4  4  4
+button 0 3 1 background border      6  3  5  5
 button 0 3 1 background scale       1
 button 0 3 1 background parent_tile 0
-button 0 3 1 border     image       pix/brd1.xpm
-button 0 3 1 border     border      4  4  4  4
-
+button 0 3 1 decoration image       pix/d1_h.png
+button 0 3 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 3 1 decoration image       pix/d2_h.png
+button 0 3 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 0 4 1 padding                4  4  4  4
-button 0 4 1 background image       pix/btn2.xpm
+button 0 4 1 padding                17  4  4  6
+button 0 4 1 minimums               30  28
+button 0 4 1 background image       pix/b_out.png
 button 0 4 1 background color       128 128 128
-button 0 4 1 background border      4  4  4  4
+button 0 4 1 background border      6  3  5  5
 button 0 4 1 background scale       1
 button 0 4 1 background parent_tile 0
-button 0 4 1 border     image       pix/brd1.xpm
-button 0 4 1 border     border      4  4  4  4
+button 0 4 1 decoration image       pix/d1_d.png
+button 0 4 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 0 4 1 decoration image       pix/d2_d.png
+button 0 4 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 0 0 padding                20  6  6  6
-button 1 0 0 background image       pix/btn2.xpm
+button 1 0 0 padding                17  16  4  6
+button 1 0 0 minimums               30  28
+button 1 0 0 background image       pix/b_out.png
 button 1 0 0 background color       128 128 128
-button 1 0 0 background border      4  4  4  4
+button 1 0 0 background border      6  3  5  5
 button 1 0 0 background scale       1
 button 1 0 0 background parent_tile 0
-button 1 0 0 decoration image       pix/led_off1.xpm
-button 1 0 0 decoration coords      0 512 6 -6   0 512 18 6
+button 1 0 0 decoration image       pix/d1_n.png
+button 1 0 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 0 0 decoration image       pix/d2_n.png
+button 1 0 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 1 0 padding                20  6  6  6
-button 1 1 0 background image       pix/btn3.xpm
+button 1 1 0 padding                17  16  4  6
+button 1 1 0 minimums               30  28
+button 1 1 0 background image       pix/b_in.png
 button 1 1 0 background color       128 128 128
-button 1 1 0 background border      4  4  4  4
+button 1 1 0 background border      6  3  5  5
 button 1 1 0 background scale       1
 button 1 1 0 background parent_tile 0
-button 1 1 0 decoration image       pix/led_off1.xpm
-button 1 1 0 decoration coords      0 512 6 -6   0 512 18 6
+button 1 1 0 decoration image       pix/d1_h.png
+button 1 1 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 1 0 decoration image       pix/d2_h.png
+button 1 1 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 2 0 padding                20  6  6  6
-button 1 2 0 background image       pix/btn1.xpm
+button 1 2 0 padding                17  16  4  6
+button 1 2 0 minimums               30  28
+button 1 2 0 background image       pix/b_out.png
 button 1 2 0 background color       128 128 128
-button 1 2 0 background border      4  4  4  4
+button 1 2 0 background border      6  3  5  5
 button 1 2 0 background scale       1
 button 1 2 0 background parent_tile 0
-button 1 2 0 decoration image       pix/led_off1.xpm
-button 1 2 0 decoration coords      0 512 6 -6   0 512 18 6
+button 1 2 0 decoration image       pix/d1_h.png
+button 1 2 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 2 0 decoration image       pix/d2_h.png
+button 1 2 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 3 0 padding                20  6  6  6
-button 1 3 0 background image       pix/btn1.xpm
+button 1 3 0 padding                17  16  4  6
+button 1 3 0 minimums               30  28
+button 1 3 0 background image       pix/b_out.png
 button 1 3 0 background color       128 128 128
-button 1 3 0 background border      4  4  4  4
+button 1 3 0 background border      6  3  5  5
 button 1 3 0 background scale       1
 button 1 3 0 background parent_tile 0
-button 1 3 0 decoration image       pix/led_off1.xpm
-button 1 3 0 decoration coords      0 512 6 -6   0 512 18 6
+button 1 3 0 decoration image       pix/d1_h.png
+button 1 3 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 3 0 decoration image       pix/d2_h.png
+button 1 3 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 4 0 padding                20  6  6  6
-button 1 4 0 background image       pix/btn2.xpm
+button 1 4 0 padding                17  16  4  6
+button 1 4 0 minimums               30  28
+button 1 4 0 background image       pix/b_out.png
 button 1 4 0 background color       128 128 128
-button 1 4 0 background border      4  4  4  4
+button 1 4 0 background border      6  3  5  5
 button 1 4 0 background scale       1
 button 1 4 0 background parent_tile 0
-button 1 4 0 decoration image       pix/led_off1.xpm
-button 1 4 0 decoration coords      0 512 6 -6   0 512 18 6
+button 1 4 0 decoration image       pix/d1_d.png
+button 1 4 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 4 0 decoration image       pix/d2_d.png
+button 1 4 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 0 1 padding                20  6  6  6
-button 1 0 1 background image       pix/btn2.xpm
+button 1 0 1 padding                17  16  4  6
+button 1 0 1 minimums               30  28
+button 1 0 1 background image       pix/b_out.png
 button 1 0 1 background color       128 128 128
-button 1 0 1 background border      4  4  4  4
+button 1 0 1 background border      6  3  5  5
 button 1 0 1 background scale       1
 button 1 0 1 background parent_tile 0
-button 1 0 1 border     image       pix/brd1.xpm
-button 1 0 1 border     border      4  4  4  4
-button 1 0 1 decoration image       pix/led_off1.xpm
-button 1 0 1 decoration coords      0 512 6 -6   0 512 18 6
+button 1 0 1 decoration image       pix/d1_n.png
+button 1 0 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 0 1 decoration image       pix/d2_n.png
+button 1 0 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 1 1 padding                20  6  6  6
-button 1 1 1 background image       pix/btn3.xpm
+button 1 1 1 padding                17  16  4  6
+button 1 1 1 minimums               30  28
+button 1 1 1 background image       pix/b_in.png
 button 1 1 1 background color       128 128 128
-button 1 1 1 background border      4  4  4  4
+button 1 1 1 background border      6  3  5  5
 button 1 1 1 background scale       1
 button 1 1 1 background parent_tile 0
-button 1 1 1 border     image       pix/brd1.xpm
-button 1 1 1 border     border      4  4  4  4
-button 1 1 1 decoration image       pix/led_off1.xpm
-button 1 1 1 decoration coords      0 512 6 -6   0 512 18 6
+button 1 1 1 decoration image       pix/d1_h.png
+button 1 1 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 1 1 decoration image       pix/d2_h.png
+button 1 1 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 2 1 padding                20  6  6  6
-button 1 2 1 background image       pix/btn1.xpm
+button 1 2 1 padding                17  16  4  6
+button 1 2 1 minimums               30  28
+button 1 2 1 background image       pix/b_out.png
 button 1 2 1 background color       128 128 128
-button 1 2 1 background border      4  4  4  4
+button 1 2 1 background border      6  3  5  5
 button 1 2 1 background scale       1
 button 1 2 1 background parent_tile 0
-button 1 2 1 border     image       pix/brd1.xpm
-button 1 2 1 border     border      4  4  4  4
-button 1 2 1 decoration image       pix/led_off1.xpm
-button 1 2 1 decoration coords      0 512 6 -6   0 512 18 6
+button 1 2 1 decoration image       pix/d1_h.png
+button 1 2 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 2 1 decoration image       pix/d2_h.png
+button 1 2 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 3 1 padding                20  6  6  6
-button 1 3 1 background image       pix/btn1.xpm
+button 1 3 1 padding                17  16  4  6
+button 1 3 1 minimums               30  28
+button 1 3 1 background image       pix/b_out.png
 button 1 3 1 background color       128 128 128
-button 1 3 1 background border      4  4  4  4
+button 1 3 1 background border      6  3  5  5
 button 1 3 1 background scale       1
 button 1 3 1 background parent_tile 0
-button 1 3 1 border     image       pix/brd1.xpm
-button 1 3 1 border     border      4  4  4  4
-button 1 3 1 decoration image       pix/led_off1.xpm
-button 1 3 1 decoration coords      0 512 6 -6   0 512 18 6
+button 1 3 1 decoration image       pix/d1_h.png
+button 1 3 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 3 1 decoration image       pix/d2_h.png
+button 1 3 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 1 4 1 padding                20  6  6  6
-button 1 4 1 background image       pix/btn2.xpm
+button 1 4 1 padding                17  16  4  6
+button 1 4 1 minimums               30  28
+button 1 4 1 background image       pix/b_out.png
 button 1 4 1 background color       128 128 128
-button 1 4 1 background border      4  4  4  4
+button 1 4 1 background border      6  3  5  5
 button 1 4 1 background scale       1
 button 1 4 1 background parent_tile 0
-button 1 4 1 border     image       pix/brd1.xpm
-button 1 4 1 border     border      4  4  4  4
-button 1 4 1 decoration image       pix/led_off1.xpm
-button 1 4 1 decoration coords      0 512 6 -6   0 512 18 6
+button 1 4 1 decoration image       pix/d1_d.png
+button 1 4 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 1 4 1 decoration image       pix/d2_d.png
+button 1 4 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
 
-button 2 0 0 padding                20  6  6  6
-button 2 0 0 background image       pix/btn2.xpm
+button 2 0 0 padding                17  16  4  6
+button 2 0 0 minimums               30  28
+button 2 0 0 background image       pix/b_out.png
 button 2 0 0 background color       128 128 128
-button 2 0 0 background border      4  4  4  4
+button 2 0 0 background border      6  3  5  5
 button 2 0 0 background scale       1
 button 2 0 0 background parent_tile 0
-button 2 0 0 decoration image       pix/led_off1.xpm
-button 2 0 0 decoration coords      0 512 6 -6   0 512 18 6
+button 2 0 0 decoration image       pix/d1_n.png
+button 2 0 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 0 0 decoration image       pix/d2_n.png
+button 2 0 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 0 0 decoration image       pix/d3_n.png
+button 2 0 0 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 1 0 padding                20  6  6  6
-button 2 1 0 background image       pix/btn3.xpm
+button 2 1 0 padding                17  16  4  6
+button 2 1 0 minimums               30  28
+button 2 1 0 background image       pix/b_in.png
 button 2 1 0 background color       128 128 128
-button 2 1 0 background border      4  4  4  4
+button 2 1 0 background border      6  3  5  5
 button 2 1 0 background scale       1
 button 2 1 0 background parent_tile 0
-button 2 1 0 decoration image       pix/led_off1.xpm
-button 2 1 0 decoration coords      0 512 6 -6   0 512 18 6
+button 2 1 0 decoration image       pix/d1_h.png
+button 2 1 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 1 0 decoration image       pix/d2_h.png
+button 2 1 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 1 0 decoration image       pix/d3_n.png
+button 2 1 0 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 2 0 padding                20  6  6  6
-button 2 2 0 background image       pix/btn1.xpm
+button 2 2 0 padding                17  16  4  6
+button 2 2 0 minimums               30  28
+button 2 2 0 background image       pix/b_out.png
 button 2 2 0 background color       128 128 128
-button 2 2 0 background border      4  4  4  4
+button 2 2 0 background border      6  3  5  5
 button 2 2 0 background scale       1
 button 2 2 0 background parent_tile 0
-button 2 2 0 decoration image       pix/led_off1.xpm
-button 2 2 0 decoration coords      0 512 6 -6   0 512 18 6
+button 2 2 0 decoration image       pix/d1_h.png
+button 2 2 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 2 0 decoration image       pix/d2_h.png
+button 2 2 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 2 0 decoration image       pix/d3_n.png
+button 2 2 0 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 3 0 padding                20  6  6  6
-button 2 3 0 background image       pix/btn1.xpm
+button 2 3 0 padding                17  16  4  6
+button 2 3 0 minimums               30  28
+button 2 3 0 background image       pix/b_out.png
 button 2 3 0 background color       128 128 128
-button 2 3 0 background border      4  4  4  4
+button 2 3 0 background border      6  3  5  5
 button 2 3 0 background scale       1
 button 2 3 0 background parent_tile 0
-button 2 3 0 decoration image       pix/led_off1.xpm
-button 2 3 0 decoration coords      0 512 6 -6   0 512 18 6
+button 2 3 0 decoration image       pix/d1_h.png
+button 2 3 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 3 0 decoration image       pix/d2_h.png
+button 2 3 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 3 0 decoration image       pix/d3_n.png
+button 2 3 0 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 4 0 padding                20  6  6  6
-button 2 4 0 background image       pix/btn2.xpm
+button 2 4 0 padding                17  16  4  6
+button 2 4 0 minimums               30  28
+button 2 4 0 background image       pix/b_out.png
 button 2 4 0 background color       128 128 128
-button 2 4 0 background border      4  4  4  4
+button 2 4 0 background border      6  3  5  5
 button 2 4 0 background scale       1
 button 2 4 0 background parent_tile 0
-button 2 4 0 decoration image       pix/led_off1.xpm
-button 2 4 0 decoration coords      0 512 6 -6   0 512 18 6
+button 2 4 0 decoration image       pix/d1_d.png
+button 2 4 0 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 4 0 decoration image       pix/d2_d.png
+button 2 4 0 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 4 0 decoration image       pix/d3_n.png
+button 2 4 0 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 0 1 padding                20  6  6  6
-button 2 0 1 background image       pix/btn2.xpm
+button 2 0 1 padding                17  16  4  6
+button 2 0 1 minimums               30  28
+button 2 0 1 background image       pix/b_out.png
 button 2 0 1 background color       128 128 128
-button 2 0 1 background border      4  4  4  4
+button 2 0 1 background border      6  3  5  5
 button 2 0 1 background scale       1
 button 2 0 1 background parent_tile 0
-button 2 0 1 border     image       pix/brd1.xpm
-button 2 0 1 border     border      4  4  4  4
-button 2 0 1 decoration image       pix/led_off1.xpm
-button 2 0 1 decoration coords      0 512 6 -6   0 512 18 6
+button 2 0 1 decoration image       pix/d1_n.png
+button 2 0 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 0 1 decoration image       pix/d2_n.png
+button 2 0 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 0 1 decoration image       pix/d3_n.png
+button 2 0 1 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 1 1 1 padding                20  6  6  6
-button 2 1 1 background image       pix/btn3.xpm
+button 2 1 1 padding                17  16  4  6
+button 2 1 1 minimums               30  28
+button 2 1 1 background image       pix/b_in.png
 button 2 1 1 background color       128 128 128
-button 2 1 1 background border      4  4  4  4
+button 2 1 1 background border      6  3  5  5
 button 2 1 1 background scale       1
 button 2 1 1 background parent_tile 0
-button 2 1 1 border     image       pix/brd1.xpm
-button 2 1 1 border     border      4  4  4  4
-button 2 1 1 decoration image       pix/led_off1.xpm
-button 2 1 1 decoration coords      0 512 6 -6   0 512 18 6
+button 2 1 1 decoration image       pix/d1_h.png
+button 2 1 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 1 1 decoration image       pix/d2_h.png
+button 2 1 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 1 1 decoration image       pix/d3_n.png
+button 2 1 1 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 2 1 padding                20  6  6  6
-button 2 2 1 background image       pix/btn1.xpm
+button 2 2 1 padding                17  16  4  6
+button 2 2 1 minimums               30  28
+button 2 2 1 background image       pix/b_out.png
 button 2 2 1 background color       128 128 128
-button 2 2 1 background border      4  4  4  4
+button 2 2 1 background border      6  3  5  5
 button 2 2 1 background scale       1
 button 2 2 1 background parent_tile 0
-button 2 2 1 border     image       pix/brd1.xpm
-button 2 2 1 border     border      4  4  4  4
-button 2 2 1 decoration image       pix/led_off1.xpm
-button 2 2 1 decoration coords      0 512 6 -6   0 512 18 6
+button 2 2 1 decoration image       pix/d1_h.png
+button 2 2 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 2 1 decoration image       pix/d2_h.png
+button 2 2 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 2 1 decoration image       pix/d3_n.png
+button 2 2 1 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 3 1 padding                20  6  6  6
-button 2 3 1 background image       pix/btn1.xpm
+button 2 3 1 padding                17  16  4  6
+button 2 3 1 minimums               30  28
+button 2 3 1 background image       pix/b_out.png
 button 2 3 1 background color       128 128 128
-button 2 3 1 background border      4  4  4  4
+button 2 3 1 background border      6  3  5  5
 button 2 3 1 background scale       1
 button 2 3 1 background parent_tile 0
-button 2 3 1 border     image       pix/brd1.xpm
-button 2 3 1 border     border      4  4  4  4
-button 2 3 1 decoration image       pix/led_off1.xpm
-button 2 3 1 decoration coords      0 512 6 -6   0 512 18 6
+button 2 3 1 decoration image       pix/d1_h.png
+button 2 3 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 3 1 decoration image       pix/d2_h.png
+button 2 3 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 3 1 decoration image       pix/d3_n.png
+button 2 3 1 decoration coords      1024 512 -16 -6   1024 512 -7 3
 
-button 2 4 1 padding                20  6  6  6
-button 2 4 1 background image       pix/btn2.xpm
+button 2 4 1 padding                17  16  4  6
+button 2 4 1 minimums               30  28
+button 2 4 1 background image       pix/b_out.png
 button 2 4 1 background color       128 128 128
-button 2 4 1 background border      4  4  4  4
+button 2 4 1 background border      6  3  5  5
 button 2 4 1 background scale       1
 button 2 4 1 background parent_tile 0
-button 2 4 1 border     image       pix/brd1.xpm
-button 2 4 1 border     border      4  4  4  4
-button 2 4 1 decoration image       pix/led_off1.xpm
-button 2 4 1 decoration coords      0 512 6 -6   0 512 18 6
+button 2 4 1 decoration image       pix/d1_d.png
+button 2 4 1 decoration coords      0 1024 0 -28   0 1024 19 -1
+button 2 4 1 decoration image       pix/d2_d.png
+button 2 4 1 decoration coords      1024 1024 -8 -10   1024 1024 -1 -3
+button 2 4 1 decoration image       pix/d3_n.png
+button 2 4 1 decoration coords      1024 512 -16 -6   1024 512 -7 3
diff --git a/themes/theme_data/pix/b_full.png b/themes/theme_data/pix/b_full.png
new file mode 100644
index 0000000000..89c196f922
--- /dev/null
+++ b/themes/theme_data/pix/b_full.png
diff --git a/themes/theme_data/pix/b_in.png b/themes/theme_data/pix/b_in.png
new file mode 100644
index 0000000000..8797528c1a
--- /dev/null
+++ b/themes/theme_data/pix/b_in.png
diff --git a/themes/theme_data/pix/b_out.png b/themes/theme_data/pix/b_out.png
new file mode 100644
index 0000000000..e616b0ef70
--- /dev/null
+++ b/themes/theme_data/pix/b_out.png
diff --git a/themes/theme_data/pix/d1_d.png b/themes/theme_data/pix/d1_d.png
new file mode 100644
index 0000000000..bae87856ed
--- /dev/null
+++ b/themes/theme_data/pix/d1_d.png
diff --git a/themes/theme_data/pix/d1_h.png b/themes/theme_data/pix/d1_h.png
new file mode 100644
index 0000000000..838ba8ffd4
--- /dev/null
+++ b/themes/theme_data/pix/d1_h.png
diff --git a/themes/theme_data/pix/d1_n.png b/themes/theme_data/pix/d1_n.png
new file mode 100644
index 0000000000..7c9af937d9
--- /dev/null
+++ b/themes/theme_data/pix/d1_n.png
diff --git a/themes/theme_data/pix/d2_d.png b/themes/theme_data/pix/d2_d.png
new file mode 100644
index 0000000000..282809a44b
--- /dev/null
+++ b/themes/theme_data/pix/d2_d.png
diff --git a/themes/theme_data/pix/d2_h.png b/themes/theme_data/pix/d2_h.png
new file mode 100644
index 0000000000..b1cf275b40
--- /dev/null
+++ b/themes/theme_data/pix/d2_h.png
diff --git a/themes/theme_data/pix/d2_n.png b/themes/theme_data/pix/d2_n.png
new file mode 100644
index 0000000000..0fd52f8b3e
--- /dev/null
+++ b/themes/theme_data/pix/d2_n.png
diff --git a/themes/theme_data/pix/d3_n.png b/themes/theme_data/pix/d3_n.png
new file mode 100644
index 0000000000..eab6167826
--- /dev/null
+++ b/themes/theme_data/pix/d3_n.png