Merge pull request #20 from shimmerproject/master

Various bug fixes and reworked granite support
Merge pull request #22 from shimmerproject/master

Various changes
add titlebar buttons, increase x-padding and  change osd to match gtk theme
Merge pull request #23 from mulberry/master

adding bitmap buttons etc
Various improvements to the Openbox theme
Improvements to the GTK2 theme
Tweaked the Xfwm4 theme