clean up unnecessary functions

changed theme names

Signed-off-by: franszo <josh@kishandchips.com>