diff --git a/src/blocks/carousel/block.json b/src/blocks/carousel/block.json
new file mode 100644
index 000000000..a5e54b265
--- /dev/null
+++ b/src/blocks/carousel/block.json
@@ -0,0 +1,108 @@
+{
+	"name": "carousel",
+	"category": "newspack",
+	"apiVersion": 3,
+	"attributes": {
+		"className": {
+			"type": "string",
+			"default": ""
+		},
+		"imageFit": {
+			"type": "string",
+			"default": "cover"
+		},
+		"autoplay": {
+			"type": "boolean",
+			"default": false
+		},
+		"delay": {
+			"type": "number",
+			"default": 5
+		},
+		"postsToShow": {
+			"type": "integer",
+			"default": 3
+		},
+		"authors": {
+			"type": "array"
+		},
+		"categories": {
+			"type": "array"
+		},
+		"includeSubcategories": {
+			"type": "boolean",
+			"default": true
+		},
+		"tags": {
+			"type": "array"
+		},
+		"customTaxonomies": {
+			"type": "array"
+		},
+		"showDate": {
+			"type": "boolean",
+			"default": true
+		},
+		"showAuthor": {
+			"type": "boolean",
+			"default": true
+		},
+		"showAvatar": {
+			"type": "boolean",
+			"default": true
+		},
+		"showCaption": {
+			"type": "boolean",
+			"default": false
+		},
+		"showCredit": {
+			"type": "boolean",
+			"default": false
+		},
+		"showCategory": {
+			"type": "boolean",
+			"default": false
+		},
+		"showTitle": {
+			"type": "boolean",
+			"default": true
+		},
+		"postType": {
+			"type": "array",
+			"default": [ "post" ],
+			"items": {
+				"type": "string"
+			}
+		},
+		"specificMode": {
+			"type": "boolean",
+			"default": false
+		},
+		"specificPosts": {
+			"type": "array",
+			"default": [],
+			"items": {
+				"type": "integer"
+			}
+		},
+		"slidesPerView": {
+			"type": "number",
+			"default": 1
+		},
+		"hideControls": {
+			"type": "boolean",
+			"default": false
+		},
+		"aspectRatio": {
+			"type": "number",
+			"default": 0.75
+		},
+		"includedPostStatuses": {
+			"type": "array",
+			"default": [ "publish" ],
+			"items": {
+				"type": "string"
+			}
+		}
+	}
+}
diff --git a/src/blocks/carousel/edit.js b/src/blocks/carousel/edit.js
index 0a7528249..39a891a31 100644
--- a/src/blocks/carousel/edit.js
+++ b/src/blocks/carousel/edit.js
@@ -19,7 +19,6 @@ import {
 	Button,
 	ButtonGroup,
 	PanelBody,
-	PanelRow,
 	Placeholder,
 	RangeControl,
 	Spinner,
@@ -362,7 +361,7 @@ class Edit extends Component {
 				</div>
 
 				<InspectorControls>
-					<PanelBody title={ __( 'Display Settings' ) } initialOpen={ true }>
+					<PanelBody title={ __( 'Content', 'newspack-blocks' ) }>
 						{ postsToShow && (
 							<QueryControls
 								numberOfItems={ postsToShow }
@@ -382,9 +381,8 @@ class Edit extends Component {
 								onCustomTaxonomiesChange={ value => setAttributes( { customTaxonomies: value } ) }
 								customTaxonomies={ customTaxonomies }
 								specificMode={ specificMode }
-								onSpecificModeChange={ _specificMode =>
-									setAttributes( { specificMode: _specificMode } )
-								}
+								onSpecificModeChange={ () => setAttributes( { specificMode: true } ) }
+								onLoopModeChange={ () => setAttributes( { specificMode: false } ) }
 								specificPosts={ specificPosts }
 								onSpecificPostsChange={ _specificPosts =>
 									setAttributes( { specificPosts: _specificPosts } )
@@ -393,86 +391,18 @@ class Edit extends Component {
 							/>
 						) }
 					</PanelBody>
-					<PanelBody title={ __( 'Slideshow Settings' ) } initialOpen={ true }>
-						<BaseControl
-							label={ __( 'Slide Aspect Ratio', 'newspack-blocks' ) }
-							help={ __(
-								'All slides will share the same aspect ratio, for consistency.',
-								'newspack-popups'
-							) }
-							id="newspack-blocks__aspect-ratio-control"
-						>
-							<PanelRow>
-								<ButtonGroup
-									id="newspack-blocks__aspect-ratio-control-buttons"
-									aria-label={ __( 'Slide Aspect Ratio', 'newspack-blocks' ) }
-								>
-									{ aspectRatioOptions.map( option => {
-										const isCurrent = aspectRatio === option.value;
-										return (
-											<Button
-												isPrimary={ isCurrent }
-												aria-pressed={ isCurrent }
-												aria-label={ option.label }
-												key={ option.value }
-												onClick={ () => setAttributes( { aspectRatio: option.value } ) }
-											>
-												{ option.shortName }
-											</Button>
-										);
-									} ) }
-								</ButtonGroup>
-							</PanelRow>
-						</BaseControl>
-						<BaseControl
-							label={ __( 'Image Fit', 'newspack-blocks' ) }
-							help={
-								'cover' === imageFit
-									? __(
-										'The image will fill the entire slide and will be cropped if necessary.',
-										'newspack-popups'
-									) : __(
-										'The image will be resized to fit inside the slide without being cropped.',
-										'newspack-popups'
-									)
-							}
-							id="newspack-blocks__blocks__image-fit-control"
-						>
-							<PanelRow>
-								<ButtonGroup
-									id="newspack-blocks__image-fit-buttons"
-									aria-label={ __( 'Image Fit', 'newspack-blocks' ) }
-								>
-									<Button
-										isPrimary={ 'cover' === imageFit }
-										aria-pressed={ 'cover' === imageFit }
-										aria-label={ __( 'Cover', 'newspack-blocks' ) }
-										onClick={ () => setAttributes( { imageFit: 'cover' } ) }
-									>
-										{ __( 'Cover', 'newspack-blocks' ) }
-									</Button>
-									<Button
-										isPrimary={ 'contain' === imageFit }
-										aria-pressed={ 'contain' === imageFit }
-										aria-label={ __( 'Contain', 'newspack-blocks' ) }
-										onClick={ () => setAttributes( { imageFit: 'contain' } ) }
-									>
-										{ __( 'Contain', 'newspack-blocks' ) }
-									</Button>
-								</ButtonGroup>
-							</PanelRow>
-						</BaseControl>
+					<PanelBody title={ __( 'Display', 'newspack-blocks' ) }>
 						<ToggleControl
-							label={ __( 'Hide Controls' ) }
-							help={ __( 'Hide the slideshow UI. Useful when used with Autoplay.' ) }
+							label={ __( 'Hide Controls', 'newspack-blocks' ) }
+							help={ __( 'Remove navigation indicators from view.', 'newspack-blocks' ) }
 							checked={ hideControls }
 							onChange={ _hideControls => {
 								setAttributes( { hideControls: _hideControls } );
 							} }
 						/>
 						<ToggleControl
-							label={ __( 'Autoplay' ) }
-							help={ __( 'Autoplay between slides' ) }
+							label={ __( 'Autoplay', 'newspack-blocks' ) }
+							help={ __( 'Automatically advance through slides.', 'newspack-blocks' ) }
 							checked={ autoplay }
 							onChange={ _autoplay => {
 								setAttributes( { autoplay: _autoplay } );
@@ -480,18 +410,20 @@ class Edit extends Component {
 						/>
 						{ autoplay && (
 							<RangeControl
-								label={ __( 'Delay between transitions (in seconds)' ) }
+								label={ __( 'Transition delay', 'newspack-blocks' ) }
 								value={ delay }
 								onChange={ _delay => {
 									setAttributes( { delay: _delay } );
 								} }
 								min={ 1 }
 								max={ 20 }
+								help={ __( 'Set the waiting time between automatic slide transitions in seconds.', 'newspack-blocks' ) }
+								__next40pxDefaultSize
 							/>
 						) }
 						{ latestPosts && 1 < latestPosts.length && (
 							<RangeControl
-								label={ __( 'Number of slides to show at once' ) }
+								label={ __( 'Slides per view', 'newspack-blocks' ) }
 								value={ slidesPerView <= latestPosts.length ? slidesPerView : latestPosts.length }
 								onChange={ _slidesPerView => {
 									setAttributes( { slidesPerView: _slidesPerView } );
@@ -502,61 +434,110 @@ class Edit extends Component {
 										? Math.min( MAX_NUMBER_OF_SLIDES, latestPosts.length )
 										: Math.min( MAX_NUMBER_OF_SLIDES, maxPosts )
 								}
+								help={ __( 'Choose how many slides appear on screen simultaneously.', 'newspack-blocks' ) }
+								__next40pxDefaultSize
 							/>
 						) }
 					</PanelBody>
-					<PanelBody title={ __( 'Article Meta Settings', 'newspack-blocks' ) }>
-						<PanelRow>
-							<ToggleControl
-								label={ __( 'Show Title', 'newspack-blocks' ) }
-								checked={ showTitle }
-								onChange={ () => setAttributes( { showTitle: ! showTitle } ) }
-							/>
-						</PanelRow>
-						<PanelRow>
-							<ToggleControl
-								label={ __( 'Show Date', 'newspack-blocks' ) }
-								checked={ showDate }
-								onChange={ () => setAttributes( { showDate: ! showDate } ) }
-							/>
-						</PanelRow>
-						<PanelRow>
-							<ToggleControl
-								label={ __( 'Show Category', 'newspack-blocks' ) }
-								checked={ showCategory }
-								onChange={ () => setAttributes( { showCategory: ! showCategory } ) }
-							/>
-						</PanelRow>
-						<PanelRow>
-							<ToggleControl
-								label={ __( 'Show Author', 'newspack-blocks' ) }
-								checked={ showAuthor }
-								onChange={ () => setAttributes( { showAuthor: ! showAuthor } ) }
-							/>
-						</PanelRow>
-						{ showAuthor && (
-							<PanelRow>
-								<ToggleControl
-									label={ __( 'Show Author Avatar', 'newspack-blocks' ) }
-									checked={ showAvatar }
-									onChange={ () => setAttributes( { showAvatar: ! showAvatar } ) }
-								/>
-							</PanelRow>
-						) }
-						<PanelRow>
-							<ToggleControl
-								label={ __( 'Show Featured Image Caption', 'newspack-blocks' ) }
-								checked={ showCaption }
-								onChange={ () => setAttributes( { showCaption: ! showCaption } ) }
-							/>
-						</PanelRow>
-						<PanelRow>
-							<ToggleControl
-								label={ __( 'Show Featured Image Credit', 'newspack-blocks' ) }
-								checked={ showCredit }
-								onChange={ () => setAttributes( { showCredit: ! showCredit } ) }
-							/>
-						</PanelRow>
+					<PanelBody title={ __( 'Featured Image', 'newspack-blocks' ) } className="newspack-block__panel">
+					<BaseControl
+							label={ __( 'Aspect ratio', 'newspack-blocks' ) }
+							help={ __(
+								'All slides will share the same aspect ratio, for consistency.',
+								'newspack-blocks'
+							) }
+							id="newspack-blocks__aspect-ratio-control"
+							className="newspack-block__button-group"
+						>
+							<ButtonGroup>
+								{ aspectRatioOptions.map( option => {
+									const isCurrent = aspectRatio === option.value;
+									return (
+										<Button
+											isPrimary={ isCurrent }
+											aria-pressed={ isCurrent }
+											aria-label={ option.label }
+											key={ option.value }
+											onClick={ () => setAttributes( { aspectRatio: option.value } ) }
+										>
+											{ option.shortName }
+										</Button>
+									);
+								} ) }
+							</ButtonGroup>
+						</BaseControl>
+						<BaseControl
+							label={ __( 'Fit', 'newspack-blocks' ) }
+							help={
+								'cover' === imageFit
+									? __(
+										'The image will fill the entire slide and will be cropped if necessary.',
+										'newspack-blocks'
+									) : __(
+										'The image will be resized to fit inside the slide without being cropped.',
+										'newspack-blocks'
+									)
+							}
+							id="newspack-blocks__blocks__image-fit-control"
+							className="newspack-block__button-group"
+						>
+							<ButtonGroup>
+								<Button
+									isPrimary={ 'cover' === imageFit }
+									aria-pressed={ 'cover' === imageFit }
+									aria-label={ __( 'Cover', 'newspack-blocks' ) }
+									onClick={ () => setAttributes( { imageFit: 'cover' } ) }
+								>
+									{ __( 'Cover', 'newspack-blocks' ) }
+								</Button>
+								<Button
+									isPrimary={ 'contain' === imageFit }
+									aria-pressed={ 'contain' === imageFit }
+									aria-label={ __( 'Contain', 'newspack-blocks' ) }
+									onClick={ () => setAttributes( { imageFit: 'contain' } ) }
+								>
+									{ __( 'Contain', 'newspack-blocks' ) }
+								</Button>
+							</ButtonGroup>
+						</BaseControl>
+						<ToggleControl
+							label={ __( 'Show caption', 'newspack-blocks' ) }
+							checked={ showCaption }
+							onChange={ () => setAttributes( { showCaption: ! showCaption } ) }
+						/>
+						<ToggleControl
+							label={ __( 'Show credit', 'newspack-blocks' ) }
+							checked={ showCredit }
+							onChange={ () => setAttributes( { showCredit: ! showCredit } ) }
+						/>
+					</PanelBody>
+					<PanelBody title={ __( 'Post Meta', 'newspack-blocks' ) }>
+						<ToggleControl
+							label={ __( 'Show title', 'newspack-blocks' ) }
+							checked={ showTitle }
+							onChange={ () => setAttributes( { showTitle: ! showTitle } ) }
+						/>
+						<ToggleControl
+							label={ __( 'Show date', 'newspack-blocks' ) }
+							checked={ showDate }
+							onChange={ () => setAttributes( { showDate: ! showDate } ) }
+						/>
+						<ToggleControl
+							label={ __( 'Show category', 'newspack-blocks' ) }
+							checked={ showCategory }
+							onChange={ () => setAttributes( { showCategory: ! showCategory } ) }
+						/>
+						<ToggleControl
+							label={ __( 'Show author', 'newspack-blocks' ) }
+							checked={ showAuthor }
+							onChange={ () => setAttributes( { showAuthor: ! showAuthor } ) }
+						/>
+						<ToggleControl
+							label={ __( 'Show avatar', 'newspack-blocks' ) }
+							checked={ showAvatar }
+							onChange={ () => setAttributes( { showAvatar: ! showAvatar } ) }
+							disabled={ ! showAuthor }
+						/>
 					</PanelBody>
 					<PostTypesPanel attributes={ attributes } setAttributes={ setAttributes } />
 					<PostStatusesPanel attributes={ attributes } setAttributes={ setAttributes } />
diff --git a/src/blocks/carousel/index.js b/src/blocks/carousel/index.js
index 0d3daed73..f45589c80 100644
--- a/src/blocks/carousel/index.js
+++ b/src/blocks/carousel/index.js
@@ -14,9 +14,13 @@ import edit from './edit';
  */
 import './view.scss';
 import './editor.scss';
+import metadata from './block.json';
+const { name, attributes, category } = metadata;
 
-export const name = 'carousel';
-export const title = __( 'Post Carousel' );
+// Name must be exported separately.
+export { name };
+
+export const title = __( 'Content Carousel', 'newspack-blocks' );
 
 export const icon = (
 	<SVG xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
@@ -35,107 +39,18 @@ export const settings = {
 		src: icon,
 		foreground: '#36f',
 	},
-	category: 'newspack',
-	keywords: [ __( 'posts' ), __( 'slideshow' ), __( 'carousel' ) ],
-	description: __( 'A carousel of posts.' ),
-	attributes: {
-		className: {
-			type: 'string',
-		},
-		imageFit: {
-			type: 'string',
-			default: 'cover',
-		},
-		autoplay: {
-			type: 'boolean',
-			default: false,
-		},
-		delay: {
-			type: 'number',
-			default: 5,
-		},
-		postsToShow: {
-			type: 'integer',
-			default: 3,
-		},
-		authors: {
-			type: 'array',
-		},
-		categories: {
-			type: 'array',
-		},
-		includeSubcategories: {
-			type: 'boolean',
-			default: true,
-		},
-		tags: {
-			type: 'array',
-		},
-		customTaxonomies: {
-			type: 'array',
-		},
-		showDate: {
-			type: 'boolean',
-			default: true,
-		},
-		showAuthor: {
-			type: 'boolean',
-			default: true,
-		},
-		showAvatar: {
-			type: 'boolean',
-			default: true,
-		},
-		showCaption: {
-			type: 'boolean',
-			default: false,
-		},
-		showCredit: {
-			type: 'boolean',
-			default: false,
-		},
-		showCategory: {
-			type: 'boolean',
-			default: false,
-		},
-		showTitle: {
-			type: 'boolean',
-			default: true,
-		},
-		postType: {
-			type: 'array',
-			default: [ 'post' ],
-			items: {
-				type: 'string',
-			},
-		},
-		specificMode: {
-			type: 'boolean',
-			default: false,
-		},
-		specificPosts: {
-			type: 'array',
-			default: [],
-			items: { type: 'integer' },
-		},
-		slidesPerView: {
-			type: 'number',
-			default: 1,
-		},
-		hideControls: {
-			type: 'boolean',
-			default: false,
-		},
-		aspectRatio: {
-			type: 'number',
-			default: 0.75,
-		},
-		includedPostStatuses: {
-			type: 'array',
-			default: [ 'publish' ],
-			items: { type: 'string' },
-		},
-	},
+	attributes,
+	category,
+	keywords: [
+		__( 'posts', 'newspack-blocks' ),
+		__( 'articles', 'newspack-blocks' ),
+		__( 'latest', 'newspack-blocks' ),
+		__( 'query', 'newspack-blocks' ),
+	],
+	description: __(
+		'An advanced block that displays content in a carousel format with customizable parameters and visual configurations.',
+		'newspack-blocks'
+	),
 	supports: {
 		html: false,
 		align: [ 'center', 'wide', 'full' ],