clean code
add map theme