early theme support added, still needs some tuning