Included latest theme tweaks