fix from locator achieve a last theme as final, it will fall back to default application template
code cleanup
fix from options and config class variable field conflict