Refactor themes to make it easier to extend or override them
remved unused fxml