Update themekey and a style change
Commit messages may be a bit messed up.