Added a few tweaks to the them