Added Theme Reset
Minor fixes