Separate you themes in folders and use this plugin to filter them in the dashboard.