Finished theme expander and removed test files