Small fixes on theme

Please read commit messages for detailed changes.