A lot of fucking changes-SORRY!
Merge branch 'thumb-styles'