diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery-lightbox/index.jsx wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery-lightbox/index.jsx
new file mode 100644
index 000000000..ac3f74448
--- /dev/null
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery-lightbox/index.jsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import ImageGallery from 'react-image-gallery';
+
+export default class ImageGalleryLightbox extends React.Component {
+
+	constructor( props ) {
+		super( props );
+	}
+
+	_renderThumbInner = ( item ) => {
+		const onThumbnailError = this.props.onThumbnailError || this._handleImageError;
+
+		return (
+			<button className = "image-gallery-thumbnail-inner">
+				<img
+					src={ item.thumbnail }
+					alt={ item.thumbnailAlt }
+					title={ item.thumbnailTitle }
+					onError={ onThumbnailError }
+				/>
+				{item.thumbnailLabel &&
+				<div className="image-gallery-thumbnail-label">
+					{item.thumbnailLabel}
+				</div>
+				}
+			</button>
+		);
+	};
+
+	render() {
+		return (
+			<ImageGallery
+				items={ this.props.items }
+				useBrowserFullscreen={ false }
+				showPlayButton={ false }
+				renderThumbInner={ this._renderThumbInner }
+				showFullscreenButton={ true }
+			/>
+		);
+	}
+}
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery-lightbox/style.scss wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery-lightbox/style.scss
new file mode 100644
index 000000000..08f427030
--- /dev/null
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery-lightbox/style.scss
@@ -0,0 +1,93 @@
+@import "node_modules/react-image-gallery/styles/scss/image-gallery.scss";
+
+#screenshots .image-gallery{
+
+    width: 100%;
+    height: auto;
+
+    .image-gallery-fullscreen-button{
+        height: 100%;
+        width: 100%;
+        &:before{
+            content: none;
+        }
+    }
+
+    .image-gallery-swipe{
+        display: flex;
+        align-items: center;
+        flex-direction: column;
+    }
+
+    .image-gallery-slides{
+        width: calc(100% - 50px);
+    }
+
+    .image-gallery-left-nav{
+        padding: 50px 10px 50px 5px;
+    }
+
+    .image-gallery-right-nav{
+        padding: 50px 5px 50px 10px;
+    }
+
+    .image-gallery-left-nav, .image-gallery-right-nav{
+        font-size: 2em;
+        
+        &:before{
+            color: #aaa;
+            text-shadow: none;
+            font-weight: bold;
+        }
+        &:hover, &:focus{
+            &:before{
+                color: #0073aa;
+            }
+        }
+    }
+
+    .image-gallery-image{
+        display: flex;
+        flex-direction: column;
+    }
+
+    .image-gallery-slide img {
+        width: auto;
+        height: 480px;
+        max-height: 80vh;
+        object-fit: scale-down;
+        overflow: hidden;
+        object-position: center center;
+    }
+
+    .image-gallery-slide .image-gallery-description{
+        background: #f5f5f5;
+        color: #32373c;
+        line-height: 1.5;
+        padding: 10px 20px;
+        white-space: normal;
+        font-size: 12.8px;
+        font-size: .8rem;
+        position: relative;
+        bottom: 0;
+        margin-bottom: 12px;
+    }
+
+    .fullscreen{
+
+        .image-gallery-slides{
+            width: 100%;
+        }
+
+        .image-gallery-slide {
+            .image-gallery-description{
+                display: none;
+            }
+        }
+
+        .image-gallery-thumbnails-wrapper{
+            display: none;
+        }
+    }
+}
+
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery/style.scss wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery/style.scss
index cd98aa9b5..8a3499cc6 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery/style.scss
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/image-gallery/style.scss
@@ -1,178 +1,178 @@
-$ig-screen-sm-min: 768px !default;
-$ig-black: #222 !default;
-$ig-blue: #337ab7 !default;
-$ig-background-black: rgba(0, 0, 0, .4) !default;
-
-.image-gallery {
-	user-select: none;
-}
-
-.image-gallery-content {
-	position: relative;
-
-	.image-gallery-left-nav,
-	.image-gallery-right-nav {
-		display: none;
-		font-size: ms( 10 );
-		height: 100%;
-		position: absolute;
-		top: 0;
-		z-index: 4;
-		border-color: #eee;
-		-webkit-transition: background 0.1s ease, border 0.1s ease;
-		transition: background 0.1s ease, border 0.1s ease;
-
-		@media (max-width: $ig-screen-sm-min) {
-			font-size: 3.4em;
-		}
-
-		@media (min-width: $ig-screen-sm-min) {
-			&:hover {
-				background: #fff;
-				opacity: 0.8;
-				border: 1px solid #eee;
-			}
-		}
-
-		&:before {
-			position: relative;
-			font-family: 'dashicons';
-		}
-	}
-
-	.image-gallery-left-nav {
-		left: 0;
-
-		&:before {
-			content: '\f341';
-		}
-
-		&:hover {
-			margin-left: -1px;
-		}
-	}
-
-	.image-gallery-right-nav {
-		right: 0;
-
-		&:before {
-			content: '\f345';
-		}
-
-		&:hover {
-			margin-right: -1px;
-		}
-	}
-
-	&:hover {
-		.image-gallery-left-nav,
-		.image-gallery-right-nav {
-			display: block;
-		}
-	}
-}
-
-.image-gallery-slides {
-	line-height: 0;
-	overflow: hidden;
-	position: relative;
-	white-space: nowrap;
-	border: 1px solid #eee;
-}
-
-.image-gallery-slide {
-	left: 0;
-	position: absolute;
-	top: 0;
-	width: 100%;
-
-	&.center {
-		position: relative;
-	}
-
-	.image-gallery-image {
-		margin: 0;
-	}
-
-	img {
-		display: block;
-		margin: 0 auto;
-	}
-
-	.image-gallery-description {
-		background: #f5f5f5;
-		color: $color__text-main;
-		line-height: 1.5;
-		padding: 10px 20px;
-		white-space: normal;
-		font-size: ms( -2 );
-
-		@media (max-width: $ig-screen-sm-min) {
-			font-size: ms( -2 );
-			padding: 8px 15px;
-		}
-
-	}
-}
-
-.image-gallery-thumbnails {
-	background: #fff;
-	margin-top: 5px;
-	//overflow: hidden;
-
-	.image-gallery-thumbnails-container {
-		cursor: pointer;
-		text-align: center;
-		white-space: nowrap;
-	}
-
-}
-
-.image-gallery-thumbnail {
-	display: table-cell;
-	margin-right: 5px;
-	border: 1px solid #eee;
-	max-height: 100px;
-	overflow: hidden;
-
-	.image-gallery-image {
-		margin: 0;
-	}
-
-	img {
-		vertical-align: middle;
-		width: 100px;
-
-		@media (max-width: $ig-screen-sm-min) {
-			width: 75px;
-		}
-	}
-
-	&:hover {
-		box-shadow: 0 1px 8px rgba(0,0,0,0.3);
-	}
-
-	&.active {
-		border: 1px solid $ig-blue;
-	}
-}
-
-.image-gallery-thumbnail-label {
-	color: $ig-black;
-	font-size: 1em;
-
-	@media(max-width: $ig-screen-sm-min) {
-		font-size: 0.8em;
-	}
-}
-
-.image-gallery-index {
-	background: $ig-background-black;
-	bottom: 0;
-	color: #fff;
-	line-height: 1;
-	padding: 10px 20px;
-	position: absolute;
-	right: 0;
-	z-index: 4;
-}
+// $ig-screen-sm-min: 768px !default;
+// $ig-black: #222 !default;
+// $ig-blue: #337ab7 !default;
+// $ig-background-black: rgba(0, 0, 0, .4) !default;
+
+// .image-gallery {
+// 	user-select: none;
+// }
+
+// .image-gallery-content {
+// 	position: relative;
+
+// 	.image-gallery-left-nav,
+// 	.image-gallery-right-nav {
+// 		display: none;
+// 		font-size: ms( 10 );
+// 		height: 100%;
+// 		position: absolute;
+// 		top: 0;
+// 		z-index: 4;
+// 		border-color: #eee;
+// 		-webkit-transition: background 0.1s ease, border 0.1s ease;
+// 		transition: background 0.1s ease, border 0.1s ease;
+
+// 		@media (max-width: $ig-screen-sm-min) {
+// 			font-size: 3.4em;
+// 		}
+
+// 		@media (min-width: $ig-screen-sm-min) {
+// 			&:hover {
+// 				background: #fff;
+// 				opacity: 0.8;
+// 				border: 1px solid #eee;
+// 			}
+// 		}
+
+// 		&:before {
+// 			position: relative;
+// 			font-family: 'dashicons';
+// 		}
+// 	}
+
+// 	.image-gallery-left-nav {
+// 		left: 0;
+
+// 		&:before {
+// 			content: '\f341';
+// 		}
+
+// 		&:hover {
+// 			margin-left: -1px;
+// 		}
+// 	}
+
+// 	.image-gallery-right-nav {
+// 		right: 0;
+
+// 		&:before {
+// 			content: '\f345';
+// 		}
+
+// 		&:hover {
+// 			margin-right: -1px;
+// 		}
+// 	}
+
+// 	&:hover {
+// 		.image-gallery-left-nav,
+// 		.image-gallery-right-nav {
+// 			display: block;
+// 		}
+// 	}
+// }
+
+// .image-gallery-slides {
+// 	line-height: 0;
+// 	overflow: hidden;
+// 	position: relative;
+// 	white-space: nowrap;
+// 	border: 1px solid #eee;
+// }
+
+// .image-gallery-slide {
+// 	left: 0;
+// 	position: absolute;
+// 	top: 0;
+// 	width: 100%;
+
+// 	&.center {
+// 		position: relative;
+// 	}
+
+// 	.image-gallery-image {
+// 		margin: 0;
+// 	}
+
+// 	img {
+// 		display: block;
+// 		margin: 0 auto;
+// 	}
+
+// 	.image-gallery-description {
+// 		background: #f5f5f5;
+// 		color: $color__text-main;
+// 		line-height: 1.5;
+// 		padding: 10px 20px;
+// 		white-space: normal;
+// 		font-size: ms( -2 );
+
+// 		@media (max-width: $ig-screen-sm-min) {
+// 			font-size: ms( -2 );
+// 			padding: 8px 15px;
+// 		}
+
+// 	}
+// }
+
+// .image-gallery-thumbnails {
+// 	background: #fff;
+// 	margin-top: 5px;
+// 	//overflow: hidden;
+
+// 	.image-gallery-thumbnails-container {
+// 		cursor: pointer;
+// 		text-align: center;
+// 		white-space: nowrap;
+// 	}
+
+// }
+
+// .image-gallery-thumbnail {
+// 	display: table-cell;
+// 	margin-right: 5px;
+// 	border: 1px solid #eee;
+// 	max-height: 100px;
+// 	overflow: hidden;
+
+// 	.image-gallery-image {
+// 		margin: 0;
+// 	}
+
+// 	img {
+// 		vertical-align: middle;
+// 		width: 100px;
+
+// 		@media (max-width: $ig-screen-sm-min) {
+// 			width: 75px;
+// 		}
+// 	}
+
+// 	&:hover {
+// 		box-shadow: 0 1px 8px rgba(0,0,0,0.3);
+// 	}
+
+// 	&.active {
+// 		border: 1px solid $ig-blue;
+// 	}
+// }
+
+// .image-gallery-thumbnail-label {
+// 	color: $ig-black;
+// 	font-size: 1em;
+
+// 	@media(max-width: $ig-screen-sm-min) {
+// 		font-size: 0.8em;
+// 	}
+// }
+
+// .image-gallery-index {
+// 	background: $ig-background-black;
+// 	bottom: 0;
+// 	color: #fff;
+// 	line-height: 1;
+// 	padding: 10px 20px;
+// 	position: absolute;
+// 	right: 0;
+// 	z-index: 4;
+// }
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/index.jsx wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/index.jsx
index 3d1cda1cc..9aeaf0da3 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/index.jsx
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/screenshots/index.jsx
@@ -8,7 +8,8 @@ import { identity, map } from 'lodash';
 /**
  * Internal dependencies.
  */
-import ImageGallery from './image-gallery';
+// import ImageGallery from './image-gallery';
+import ImageGalleryLightbox from './image-gallery-lightbox';
 
 export const Screenshots = ( { screenshots } ) => {
 	const items = map( screenshots, ( { caption, src } ) => ( {
@@ -23,7 +24,8 @@ export const Screenshots = ( { screenshots } ) => {
 		return (
 			<div id="screenshots" className="plugin-screenshots">
 				<h2>{ localeData.screenshots }</h2>
-				<ImageGallery items={ items } />
+				{/* <ImageGallery items={ items } /> */}
+				<ImageGalleryLightbox items={ items } />
 			</div>
 		);
 	}
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json
index 87f09f1cd..791353314 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json
@@ -58,6 +58,7 @@
   "dependencies": {
     "i18n-calypso": "^1.7.0",
     "json-loader": "^0.5.4",
-    "wpapi": "^1.0.0"
+    "wpapi": "^1.0.0",
+    "react-image-gallery": "^0.8.16"
   }
 }