Optimizations mainly, need to fix theme selector