Updates from static
Tweaks to theme