diff --git a/web/src/index.js b/web/src/index.js
index 9f71da2252977285375c9765516f307895d44ebe..87ec3be25c89bad5221f8e3f8315d927f85e67fb 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -46,7 +46,15 @@ const makeThumbnailURL = (content) => {
 // This is also used to fix scrolling to sections on Element iOS
 const isMobileSafari = navigator.userAgent.match(/(iPod|iPhone|iPad)/) && navigator.userAgent.match(/AppleWebKit/)
 
-const supportedThemes = ["light", "dark", "black"]
+const supportedThemes = [
+	"light",
+	"dark",
+	"black",
+	"catppuccin-latte",
+	"catppuccin-frappe",
+	"catppuccin-macchiato",
+	"catppuccin-mocha"
+]
 
 const defaultState = {
 	viewingGifs: false,
@@ -428,9 +436,9 @@ const Settings = ({app}) => html`
 				<label for="theme">Theme: </label>
 				<select name="theme" id="theme" onChange=${evt => app.setTheme(evt.target.value)}>
 					<option value="default">Default</option>
-					<option value="light">Light</option>
-					<option value="dark">Dark</option>
-					<option value="black">Black</option>
+					${supportedThemes.map((theme) =>
+						html`<option value="${theme}">${theme.replace(/(^\w|\s\w|-\w)/g, m => m.toUpperCase()).replace(/-/, ' ')}</option>`
+					)}
 				</select>
 			</div>
 			<div>
diff --git a/web/style/index.css b/web/style/index.css
index 3a7fe4852f433188f613412b4aeec24f05fa4198..b689551a0ce4d8a5596f2b57c22a71c4e5c9a3be 100644
--- a/web/style/index.css
+++ b/web/style/index.css
@@ -1 +1 @@
-*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row));--accent-color: #00C853;--spinner-bg-color: var(--accent-color)}main{color:var(--text-color)}main.spinner{height:100vh;display:flex;align-items:center}main.error,main.empty{text-align:center;margin:2rem}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;grid-template-rows:calc(12vw + 2px) min-content auto}body.theme-light{--highlight-color: #eee;--search-box-color: var(--highlight-color);--text-color: black;background-color:#fff}body.theme-dark{--highlight-color: #444;--search-box-color: #383e4b;--text-color: white;background-color:#22262e}body.theme-dark .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}body.theme-black{--highlight-color: #222;--search-box-color: var(--highlight-color);--text-color: white;background-color:#000}body.theme-black .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}div.powered-by-giphy{padding:1rem}div.powered-by-giphy>img{width:100%}input[type=checkbox],input[type=range]{accent-color:var(--accent-color)}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}.icon.icon-search{--icon-image: url(../res/search.svg)}.icon.icon.icon-giphy{background:center/contain no-repeat url(../res/giphy-light.svg);mask:unset}.icon.icon-reset{--icon-image: url(../res/reset.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:var(--accent-color)}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(calc(12vw + 2px) + calc(2 * 0.7rem + 2 * 0.5rem + 1rem));bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}div.search-empty{margin:1.2rem;text-align:center}section.stickerpack:not(:first-of-type){margin-top:.5rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 .5rem 0;padding:0}section.stickerpack>h1>a{padding:.5rem;color:var(--text-color);background-color:var(--search-box-color);display:block;text-decoration:none}section.stickerpack#pack-giphy{display:flex;justify-content:space-between;flex-direction:column;min-height:100%}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;margin:15%}div.search-box{display:flex;margin:.5rem;padding:0;border-radius:.4rem;background-color:var(--search-box-color);opacity:.5;transition:all .1s;border:1px solid transparent}div.search-box:focus-within{opacity:1;border:1px solid var(--accent-color)}div.search-box:not(:focus-within):hover{opacity:.7}div.search-box input,div.search-box .icon-display{color:var(--text-color);outline:none;border:none;height:1rem;margin:0;padding:.7rem;background-color:transparent;-webkit-tap-highlight-color:transparent}div.search-box .icon-display{width:1rem}div.search-box .icon-display.reset-click-zone{cursor:pointer}div.search-box .icon-display .icon{display:block;width:1rem;height:1rem}div.search-box .icon-display .icon-search{opacity:.5}div.search-box input{flex-grow:1;font-size:1rem}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input:not([type=checkbox]){width:100%}.gif-indicator{position:absolute;top:10px;left:10px;background-color:var(--highlight-color);color:var(--text-color);padding:5px;border-radius:3px;opacity:.7}
+*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row));--accent-color: #00C853;--spinner-bg-color: var(--accent-color)}main{color:var(--text-color)}main.spinner{height:100vh;display:flex;align-items:center}main.error,main.empty{text-align:center;margin:2rem}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;grid-template-rows:calc(12vw + 2px) min-content auto}body.theme-light{--highlight-color: #eee;--search-box-color: var(--highlight-color);--text-color: black;background-color:#fff}body.theme-dark{--highlight-color: #444;--search-box-color: #383e4b;--text-color: white;background-color:#22262e}body.theme-dark .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}body.theme-black{--highlight-color: #222;--search-box-color: var(--highlight-color);--text-color: white;background-color:#000}body.theme-black .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}div.powered-by-giphy{padding:1rem}div.powered-by-giphy>img{width:100%}body.theme-catppuccin-latte{--highlight-color: #ccd0da;--search-box-color: var(--highlight-color);--text-color: #4c4f69;--accent-color: #40a02b;background-color:#e6e9ef}body.theme-catppuccin-frappe{--highlight-color: #414559;--search-box-color: var(--highlight-color);--text-color: #c6d0f5;--accent-color: #a6d189;background-color:#292c3c}body.theme-catppuccin-macchiato{--highlight-color: #363a4f;--search-box-color: var(--highlight-color);--text-color: #cad3f5;--accent-color: #a6da95;background-color:#1e2030}body.theme-catppuccin-mocha{--highlight-color: #313244;--search-box-color: var(--highlight-color);--text-color: #cdd6f4;--accent-color: #a6e3a1;background-color:#181825}input[type=checkbox],input[type=range]{accent-color:var(--accent-color)}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}.icon.icon-search{--icon-image: url(../res/search.svg)}.icon.icon.icon-giphy{background:center/contain no-repeat url(../res/giphy-light.svg);mask:unset}.icon.icon-reset{--icon-image: url(../res/reset.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:var(--accent-color)}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(calc(12vw + 2px) + calc(2 * 0.7rem + 2 * 0.5rem + 1rem));bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}div.search-empty{margin:1.2rem;text-align:center}section.stickerpack:not(:first-of-type){margin-top:.5rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 .5rem 0;padding:0}section.stickerpack>h1>a{padding:.5rem;color:var(--text-color);background-color:var(--search-box-color);display:block;text-decoration:none}section.stickerpack#pack-giphy{display:flex;justify-content:space-between;flex-direction:column;min-height:100%}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;margin:15%}div.search-box{display:flex;margin:.5rem;padding:0;border-radius:.4rem;background-color:var(--search-box-color);opacity:.5;transition:all .1s;border:1px solid transparent}div.search-box:focus-within{opacity:1;border:1px solid var(--accent-color)}div.search-box:not(:focus-within):hover{opacity:.7}div.search-box input,div.search-box .icon-display{color:var(--text-color);outline:none;border:none;height:1rem;margin:0;padding:.7rem;background-color:transparent;-webkit-tap-highlight-color:transparent}div.search-box .icon-display{width:1rem}div.search-box .icon-display.reset-click-zone{cursor:pointer}div.search-box .icon-display .icon{display:block;width:1rem;height:1rem}div.search-box .icon-display .icon-search{opacity:.5}div.search-box input{flex-grow:1;font-size:1rem}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input:not([type=checkbox]){width:100%}.gif-indicator{position:absolute;top:10px;left:10px;background-color:var(--highlight-color);color:var(--text-color);padding:5px;border-radius:3px;opacity:.7}
diff --git a/web/style/index.sass b/web/style/index.sass
index 52c1cfd1d46d7d1b32f0a9233e1cba78bb07035e..7fd2633fb7b65d3c1c0ee2f18790b38607399d5f 100644
--- a/web/style/index.sass
+++ b/web/style/index.sass
@@ -92,6 +92,36 @@ div.powered-by-giphy
   > img
     width: 100%
 
+// Colors for Catppuccin themes are (in order) : Surface0, -, Text, Green, Mantle
+
+body.theme-catppuccin-latte
+  --highlight-color: #ccd0da
+  --search-box-color: var(--highlight-color)
+  --text-color: #4c4f69
+  --accent-color: #40a02b
+  background-color: #e6e9ef
+
+body.theme-catppuccin-frappe
+  --highlight-color: #414559
+  --search-box-color: var(--highlight-color)
+  --text-color: #c6d0f5
+  --accent-color: #a6d189
+  background-color: #292c3c
+
+body.theme-catppuccin-macchiato
+  --highlight-color: #363a4f
+  --search-box-color: var(--highlight-color)
+  --text-color: #cad3f5
+  --accent-color: #a6da95
+  background-color: #1e2030
+
+body.theme-catppuccin-mocha
+  --highlight-color: #313244
+  --search-box-color: var(--highlight-color)
+  --text-color: #cdd6f4
+  --accent-color: #a6e3a1
+  background-color: #181825
+
 input[type="checkbox"],input[type="range"]
   accent-color: var(--accent-color)