Minor themes fixes