added citytheme
changed name
merged master fix error
merged conflicts