More style updates
Styles on styles
Merge remote-tracking branch 'upstream/master'
Styles on styles on styles
Fixed conflicts
Merge and modify
Merge pull request #5 from bexcitement/master

Action bar style etc