More work on buttons + transparent style/theme