Added remove theme; fixed bugs