Tweaks and new theme