diff --git a/assets/frappe.webp b/assets/frappe.webp
index 64baad60..5d3864ee 100644
Binary files a/assets/frappe.webp and b/assets/frappe.webp differ
diff --git a/assets/latte.webp b/assets/latte.webp
index 8a714257..3c4f1b3b 100644
Binary files a/assets/latte.webp and b/assets/latte.webp differ
diff --git a/assets/macchiato.webp b/assets/macchiato.webp
index 38dddede..8fbe8674 100644
Binary files a/assets/macchiato.webp and b/assets/macchiato.webp differ
diff --git a/assets/mocha.webp b/assets/mocha.webp
index 308a3110..797474e7 100644
Binary files a/assets/mocha.webp and b/assets/mocha.webp differ
diff --git a/icons/css-variables/folder_caddy.svg b/icons/css-variables/folder_caddy.svg
new file mode 100644
index 00000000..85a3f195
--- /dev/null
+++ b/icons/css-variables/folder_caddy.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="var(--vscode-ctp-text)" stroke-linecap="round" stroke-linejoin="round" d="M 4.5,4.5 H 12 c 0.828427,0 1.5,0.6715729 1.5,1.5 V 6.5 M 6,13.5 H 2 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="var(--vscode-ctp-green)" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="var(--vscode-ctp-sky)" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/css-variables/folder_caddy_open.svg b/icons/css-variables/folder_caddy_open.svg
new file mode 100644
index 00000000..3be4f40a
--- /dev/null
+++ b/icons/css-variables/folder_caddy_open.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="var(--vscode-ctp-text)" stroke-linecap="round" stroke-linejoin="round" d="M 1.8748797,8.0004811 2.5606339,5.2574644 C 2.6719257,4.8122974 3.0719088,4.5 3.5307764,4.5 H 14.469224 c 0.552284,0 1,0.4477152 1,1 0,0.081762 -0.01003,0.163215 -0.02986,0.2425356 L 15.124325,7.0026989 M 6,13.5 H 2.0043488 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="var(--vscode-ctp-green)" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="var(--vscode-ctp-sky)" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/frappe/folder_caddy.svg b/icons/frappe/folder_caddy.svg
new file mode 100644
index 00000000..e87ea57a
--- /dev/null
+++ b/icons/frappe/folder_caddy.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#c6d0f5" stroke-linecap="round" stroke-linejoin="round" d="M 4.5,4.5 H 12 c 0.828427,0 1.5,0.6715729 1.5,1.5 V 6.5 M 6,13.5 H 2 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#a6d189" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#99d1db" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/frappe/folder_caddy_open.svg b/icons/frappe/folder_caddy_open.svg
new file mode 100644
index 00000000..7b78b1cc
--- /dev/null
+++ b/icons/frappe/folder_caddy_open.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#c6d0f5" stroke-linecap="round" stroke-linejoin="round" d="M 1.8748797,8.0004811 2.5606339,5.2574644 C 2.6719257,4.8122974 3.0719088,4.5 3.5307764,4.5 H 14.469224 c 0.552284,0 1,0.4477152 1,1 0,0.081762 -0.01003,0.163215 -0.02986,0.2425356 L 15.124325,7.0026989 M 6,13.5 H 2.0043488 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#a6d189" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#99d1db" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/latte/folder_caddy.svg b/icons/latte/folder_caddy.svg
new file mode 100644
index 00000000..2d13195c
--- /dev/null
+++ b/icons/latte/folder_caddy.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#4c4f69" stroke-linecap="round" stroke-linejoin="round" d="M 4.5,4.5 H 12 c 0.828427,0 1.5,0.6715729 1.5,1.5 V 6.5 M 6,13.5 H 2 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#40a02b" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#04a5e5" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/latte/folder_caddy_open.svg b/icons/latte/folder_caddy_open.svg
new file mode 100644
index 00000000..4a6eb004
--- /dev/null
+++ b/icons/latte/folder_caddy_open.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#4c4f69" stroke-linecap="round" stroke-linejoin="round" d="M 1.8748797,8.0004811 2.5606339,5.2574644 C 2.6719257,4.8122974 3.0719088,4.5 3.5307764,4.5 H 14.469224 c 0.552284,0 1,0.4477152 1,1 0,0.081762 -0.01003,0.163215 -0.02986,0.2425356 L 15.124325,7.0026989 M 6,13.5 H 2.0043488 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#40a02b" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#04a5e5" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/macchiato/folder_caddy.svg b/icons/macchiato/folder_caddy.svg
new file mode 100644
index 00000000..db362901
--- /dev/null
+++ b/icons/macchiato/folder_caddy.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#cad3f5" stroke-linecap="round" stroke-linejoin="round" d="M 4.5,4.5 H 12 c 0.828427,0 1.5,0.6715729 1.5,1.5 V 6.5 M 6,13.5 H 2 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#a6da95" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#91d7e3" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/macchiato/folder_caddy_open.svg b/icons/macchiato/folder_caddy_open.svg
new file mode 100644
index 00000000..62e776b6
--- /dev/null
+++ b/icons/macchiato/folder_caddy_open.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#cad3f5" stroke-linecap="round" stroke-linejoin="round" d="M 1.8748797,8.0004811 2.5606339,5.2574644 C 2.6719257,4.8122974 3.0719088,4.5 3.5307764,4.5 H 14.469224 c 0.552284,0 1,0.4477152 1,1 0,0.081762 -0.01003,0.163215 -0.02986,0.2425356 L 15.124325,7.0026989 M 6,13.5 H 2.0043488 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#a6da95" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#91d7e3" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/mocha/folder_caddy.svg b/icons/mocha/folder_caddy.svg
new file mode 100644
index 00000000..146d7efa
--- /dev/null
+++ b/icons/mocha/folder_caddy.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#cdd6f4" stroke-linecap="round" stroke-linejoin="round" d="M 4.5,4.5 H 12 c 0.828427,0 1.5,0.6715729 1.5,1.5 V 6.5 M 6,13.5 H 2 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#a6e3a1" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#89dceb" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/icons/mocha/folder_caddy_open.svg b/icons/mocha/folder_caddy_open.svg
new file mode 100644
index 00000000..2b7be588
--- /dev/null
+++ b/icons/mocha/folder_caddy_open.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<path fill="none" stroke="#cdd6f4" stroke-linecap="round" stroke-linejoin="round" d="M 1.8748797,8.0004811 2.5606339,5.2574644 C 2.6719257,4.8122974 3.0719088,4.5 3.5307764,4.5 H 14.469224 c 0.552284,0 1,0.4477152 1,1 0,0.081762 -0.01003,0.163215 -0.02986,0.2425356 L 15.124325,7.0026989 M 6,13.5 H 2.0043488 C 1.1715729,13.5 0.5,12.828427 0.5,12 V 3.5 c 0,-0.5522847 0.44771525,-1 1,-1 h 5 c 0.5522847,0 1,0.4477153 1,1 v 1" />
+	<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+		<path stroke="#a6e3a1" d="m 12.269607,13.774064 h 0.947285 V 11.468057 H 10.319991 V 11.9522 m 2.317521,-0.484143 v -0.864753 c 0,-1.1530034 -1.738141,-1.1530034 -1.738141,0 v 0.864753" />
+		<path stroke="#89dceb" d="m 15.273692,10.464943 c 0.521443,1.441255 0.127464,3.055461 -1.013915,4.075869 -1.071861,0.96363 -2.605888,1.226262 -3.939786,0.674507 C 9.7633269,14.930258 9.2462058,14.664869 8.7093134,13.947015 7.523369,12.30815 7.8508497,10.02972 9.4509202,8.7873229 10.96759,7.6074448 13.136916,7.7671525 14.46256,9.1562841 c 0.30992,0.396875 0.679155,0.7937501 0.811132,1.3086589 z m -5.5863859,3.879621 1.0426849,-0.975757 m 4.219032,-3.5849084 -0.65956,0.5370324" />
+	</g>
+</svg>
diff --git a/src/defaults/folderIcons.ts b/src/defaults/folderIcons.ts
index 801d418f..6a24de36 100644
--- a/src/defaults/folderIcons.ts
+++ b/src/defaults/folderIcons.ts
@@ -85,6 +85,14 @@ const folderIcons: Record<string, {
       'measurement',
     ],
   },
+  'caddy': {
+    folderNames: [
+      '.caddy',
+      '.caddyfiles',
+      'caddy',
+      'caddyfiles',
+    ],
+  },
   'circle-ci': {
     folderNames: ['.circleci'],
   },