1) The layout should be more flexible.
2) Use the native menu for selecting a theme.