Improve guider logic and theme layout