diff --git a/components/Image.tsx b/components/Image.tsx
index 3637bfe..fde277a 100644
--- a/components/Image.tsx
+++ b/components/Image.tsx
@@ -1,6 +1,5 @@
 import NextImage, { ImageProps } from 'next/image'
-import { ItemRef } from 'react-photoswipe-gallery'
 
-const Image = ({ ...rest }: ImageProps & { ref?: ItemRef }) => <NextImage {...rest} />
+const Image = ({ ...rest }: ImageProps) => <NextImage {...rest} />
 
 export default Image
diff --git a/components/MediaItem.tsx b/components/MediaItem.tsx
index bf11620..49575e6 100644
--- a/components/MediaItem.tsx
+++ b/components/MediaItem.tsx
@@ -4,7 +4,7 @@ import YoutubeVideo from './YouTubeVideo'
 const MediaItem = (props) => {
   const { type, title, data } = props
 
-  if (type !== 'video' && type !== 'photos') return null
+  if ((type !== 'video' && type !== 'photos') || !data) return null
 
   const item =
     type === 'video' ? (
diff --git a/components/PhotoGallery.tsx b/components/PhotoGallery.tsx
index 7806575..ee48945 100644
--- a/components/PhotoGallery.tsx
+++ b/components/PhotoGallery.tsx
@@ -1,20 +1,43 @@
-import 'photoswipe/dist/photoswipe.css'
-import { Gallery, Item } from 'react-photoswipe-gallery'
+import { useState } from 'react'
+import Lightbox from 'react-image-lightbox'
+import 'react-image-lightbox/style.css'
 import Image from './Image'
 
 const PhotoGallery = (props) => {
   const { title, data } = props
+  const [isOpen, setIsOpen] = useState(false)
+  const [photoIndex, setPhotoIndex] = useState(0)
 
   return (
-    <Gallery>
+    <div className="flex flex-row gap-2 p-2">
       {data.length
-        ? data.map((d: string) => (
-            <Item cropped key={d}>
-              {({ ref, open }) => <Image alt={title} ref={ref} onClick={open} src={d} />}
-            </Item>
+        ? data.map((d: string, index: number) => (
+            <Image
+              key={d}
+              alt={title}
+              onClick={() => {
+                setPhotoIndex(index)
+                setIsOpen(true)
+              }}
+              src={d}
+              className="w-full cursor-pointer object-cover"
+              width="300px"
+              height="300px"
+            />
           ))
         : null}
-    </Gallery>
+
+      {isOpen && (
+        <Lightbox
+          mainSrc={data[photoIndex]}
+          nextSrc={data[(photoIndex + 1) % data.length]}
+          prevSrc={data[(photoIndex + data.length - 1) % data.length]}
+          onCloseRequest={() => setIsOpen(false)}
+          onMovePrevRequest={() => setPhotoIndex((photoIndex + data.length - 1) % data.length)}
+          onMoveNextRequest={() => setPhotoIndex((photoIndex + 1) % data.length)}
+        />
+      )}
+    </div>
   )
 }
 
diff --git a/data/mediaData.ts b/data/mediaData.ts
index b879625..072e07b 100644
--- a/data/mediaData.ts
+++ b/data/mediaData.ts
@@ -1,9 +1,19 @@
 const mediaData = [
   {
     type: 'video',
-    title: ' Beatus - live @ Trois-Rivières Metal Fest 2004',
+    title: 'Beatus - live @ Trois-Rivières Metal Fest 2004',
     data: 'GC65l2Fo1q8',
   },
+  {
+    type: 'photos',
+    title: 'Ashes of Autumn',
+    data: [
+      '/static/images/media/photos/ashes-of-autumn/01.jpg',
+      '/static/images/media/photos/ashes-of-autumn/02.jpg',
+      '/static/images/media/photos/ashes-of-autumn/03.jpg',
+      '/static/images/media/photos/ashes-of-autumn/04.jpg',
+    ],
+  },
 ]
 
 export default mediaData
diff --git a/package-lock.json b/package-lock.json
index 89f1540..e010265 100644
Binary files a/package-lock.json and b/package-lock.json differ
diff --git a/package.json b/package.json
index f8effcf..935843a 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,10 @@
     "mdx-bundler": "^8.0.0",
     "next": "12.1.0",
     "next-themes": "^0.0.14",
-    "photoswipe": "^5.2.7",
     "postcss": "^8.4.5",
     "preact": "^10.6.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-photoswipe-gallery": "^2.2.1",
     "reading-time": "1.3.0",
     "rehype-autolink-headings": "^6.1.0",
     "rehype-citation": "^0.2.0",
@@ -66,6 +64,7 @@
     "next-remote-watch": "^1.0.0",
     "prettier": "^2.5.1",
     "prettier-plugin-tailwindcss": "^0.1.4",
+    "react-image-lightbox": "^5.1.4",
     "socket.io": "^4.4.0",
     "socket.io-client": "^4.4.0",
     "typescript": "^4.6.1-rc"
diff --git a/public/static/images/media/photos/ashes-of-autumn/01.jpg b/public/static/images/media/photos/ashes-of-autumn/01.jpg
new file mode 100755
index 0000000..c23f667
Binary files /dev/null and b/public/static/images/media/photos/ashes-of-autumn/01.jpg differ
diff --git a/public/static/images/media/photos/ashes-of-autumn/02.jpg b/public/static/images/media/photos/ashes-of-autumn/02.jpg
new file mode 100755
index 0000000..fcbeede
Binary files /dev/null and b/public/static/images/media/photos/ashes-of-autumn/02.jpg differ
diff --git a/public/static/images/media/photos/ashes-of-autumn/03.jpg b/public/static/images/media/photos/ashes-of-autumn/03.jpg
new file mode 100755
index 0000000..7f02f5c
Binary files /dev/null and b/public/static/images/media/photos/ashes-of-autumn/03.jpg differ
diff --git a/public/static/images/media/photos/ashes-of-autumn/04.jpg b/public/static/images/media/photos/ashes-of-autumn/04.jpg
new file mode 100755
index 0000000..3141db9
Binary files /dev/null and b/public/static/images/media/photos/ashes-of-autumn/04.jpg differ