merge theme settings
unified debug loggin
cleanup