Continues implementation of themeing feature