change service names accurding to yima service naming
can set default theme by static method
code cleanup