Themed apps dialog and minor fixes