Index: src/wp-admin/css/customize-widgets.css
===================================================================
--- src/wp-admin/css/customize-widgets.css	(revision 30624)
+++ src/wp-admin/css/customize-widgets.css	(working copy)
@@ -7,11 +7,11 @@
  * preview loads and we know whether the sidebars are used in the template.
  */
 
-.control-section[id^="accordion-section-sidebar-widgets-"],
+.control-section.control-section-sidebar,
 .customize-control-sidebar_widgets label,
 .customize-control-sidebar_widgets .hide-if-js {
 	/* The link in .customize-control-sidebar_widgets .hide-if-js will fail if it ever gets used. */
-	display:none;
+	display: none;
 }
 
 .customize-control-widget_form .widget-top {
Index: src/wp-includes/class-wp-customize-panel.php
===================================================================
--- src/wp-includes/class-wp-customize-panel.php	(revision 30624)
+++ src/wp-includes/class-wp-customize-panel.php	(working copy)
@@ -103,11 +103,13 @@
 	public $sections;
 
 	/**
+	 * Type of this panel.
+	 *
 	 * @since 4.1.0
 	 * @access public
 	 * @var string
 	 */
-	public $type;
+	public $type = 'default';
 
 	/**
 	 * Active callback.
@@ -285,8 +287,9 @@
 	 * @access protected
 	 */
 	protected function render() {
+		$classes = 'accordion-section control-section control-panel control-panel-' . $this->type;
 		?>
-		<li id="accordion-panel-<?php echo esc_attr( $this->id ); ?>" class="control-section control-panel accordion-section">
+		<li id="accordion-panel-<?php echo esc_attr( $this->id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
 			<h3 class="accordion-section-title" tabindex="0">
 				<?php echo esc_html( $this->title ); ?>
 				<span class="screen-reader-text"><?php _e( 'Press return or enter to open this panel' ); ?></span>
Index: src/wp-includes/class-wp-customize-section.php
===================================================================
--- src/wp-includes/class-wp-customize-section.php	(revision 30624)
+++ src/wp-includes/class-wp-customize-section.php	(working copy)
@@ -112,11 +112,13 @@
 	public $controls;
 
 	/**
+	 * Type of this section.
+	 *
 	 * @since 4.1.0
 	 * @access public
 	 * @var string
 	 */
-	public $type;
+	public $type = 'default';
 
 	/**
 	 * Active callback.
@@ -292,7 +294,7 @@
 	 * @since 3.4.0
 	 */
 	protected function render() {
-		$classes = 'control-section accordion-section';
+		$classes = 'accordion-section control-section control-section-' . $this->type;
 		?>
 		<li id="accordion-section-<?php echo esc_attr( $this->id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
 			<h3 class="accordion-section-title" tabindex="0">
@@ -324,6 +326,8 @@
 class WP_Customize_Sidebar_Section extends WP_Customize_Section {
 
 	/**
+	 * Type of this section.
+	 *
 	 * @since 4.1.0
 	 * @access public
 	 * @var string
