refactor theme to use more throughout where appropriate

[jebeni777]

and makeStyles everywhere else more item specific