Theme little fixes