theme settings converted
started cleanup