more proper themeing