Removed unneeded theme plus some build tweaks.