Theme tweaks and adding code