fixed themes stuff