Added some stuff from Claire's Theme
Merge branch 'Thread' of https://github.com/psmagicman/think-global-hack-local into Thread