Fix theme and cleanup