diff --git a/.changeset/fast-trainers-stare.md b/.changeset/fast-trainers-stare.md
new file mode 100644
index 00000000..48f6866c
--- /dev/null
+++ b/.changeset/fast-trainers-stare.md
@@ -0,0 +1,5 @@
+---
+'create-solana-dapp': patch
+---
+
+enable gill-next-tailwind-basic and gill-next-tailwind-counter templates
diff --git a/src/templates/frameworks.ts b/src/templates/frameworks.ts
index 2f5b7603..7b103140 100644
--- a/src/templates/frameworks.ts
+++ b/src/templates/frameworks.ts
@@ -13,36 +13,36 @@ export const frameworks: Framework[] = [
     name: 'Next.js',
     description: 'A React framework by Vercel',
     templates: [
-      // {
-      //   name: 'gill-next-tailwind-counter',
-      //   description: 'Next.js, Tailwind, Anchor Counter Example, gill (based on @solana/kit), Wallet UI',
-      //   repository: 'gh:solana-developers/solana-templates/templates/template-next-tailwind-counter',
-      // },
-      // {
-      //   name: 'gill-next-tailwind-basic',
-      //   description: 'Next.js, Tailwind, basic Anchor example, gill (based on @solana/kit), Wallet UI',
-      //   repository: 'gh:solana-developers/solana-templates/templates/template-next-tailwind-basic',
-      // },
       {
         name: 'gill-next-tailwind',
         description: 'Next.js, Tailwind, gill (based on @solana/kit), Wallet UI',
         repository: 'gh:solana-developers/solana-templates/templates/template-next-tailwind',
       },
       {
-        name: 'web3js-next-tailwind-counter',
-        description: 'Next.js, Tailwind, Anchor Counter Example, @solana/web3.js, Wallet Adapter',
-        repository: 'gh:solana-developers/solana-templates/legacy/legacy-next-tailwind-counter',
+        name: 'gill-next-tailwind-basic',
+        description: 'Next.js, Tailwind, basic Anchor example, gill (based on @solana/kit), Wallet UI',
+        repository: 'gh:solana-developers/solana-templates/templates/template-next-tailwind-basic',
       },
       {
-        name: 'web3js-next-tailwind-basic',
-        description: 'Legacy Next.js, Tailwind, basic Anchor example, @solana/web3.js, Wallet Adapter',
-        repository: 'gh:solana-developers/solana-templates/legacy/legacy-next-tailwind-basic',
+        name: 'gill-next-tailwind-counter',
+        description: 'Next.js, Tailwind, Anchor Counter Example, gill (based on @solana/kit), Wallet UI',
+        repository: 'gh:solana-developers/solana-templates/templates/template-next-tailwind-counter',
       },
       {
         name: 'web3js-next-tailwind',
         description: 'Legacy Next.js, Tailwind, no Anchor, @solana/web3.js, Wallet Adapter',
         repository: 'gh:solana-developers/solana-templates/legacy/legacy-next-tailwind',
       },
+      {
+        name: 'web3js-next-tailwind-basic',
+        description: 'Legacy Next.js, Tailwind, basic Anchor example, @solana/web3.js, Wallet Adapter',
+        repository: 'gh:solana-developers/solana-templates/legacy/legacy-next-tailwind-basic',
+      },
+      {
+        name: 'web3js-next-tailwind-counter',
+        description: 'Next.js, Tailwind, Anchor Counter Example, @solana/web3.js, Wallet Adapter',
+        repository: 'gh:solana-developers/solana-templates/legacy/legacy-next-tailwind-counter',
+      },
     ],
   },
   {
@@ -67,25 +67,25 @@ export const frameworks: Framework[] = [
     name: 'React with Vite',
     description: 'React with Vite and React Router',
     templates: [
-      // {
-      //   name: 'gill-react-vite-tailwind-counter',
-      //   description: 'React with Vite, Tailwind, Anchor Counter Example',
-      //   repository: 'gh:solana-developers/solana-templates/templates/template-react-vite-tailwind-counter',
-      // },
-      // {
-      //   name: 'gill-react-vite-tailwind-basic',
-      //   description: 'React with Vite, Tailwind, basic Anchor example',
-      //   repository: 'gh:solana-developers/solana-templates/templates/template-react-vite-tailwind-basic',
-      // },
       {
         name: 'gill-react-vite-tailwind',
         description: 'React with Vite, Tailwind, gill (based on @solana/kit), Wallet UI',
         repository: 'gh:solana-developers/solana-templates/templates/template-react-vite-tailwind',
       },
+      // {
+      //   name: 'gill-react-vite-tailwind-basic',
+      //   description: 'React with Vite, Tailwind, basic Anchor example',
+      //   repository: 'gh:solana-developers/solana-templates/templates/template-react-vite-tailwind-basic',
+      // },
+      // {
+      //   name: 'gill-react-vite-tailwind-counter',
+      //   description: 'React with Vite, Tailwind, Anchor Counter Example',
+      //   repository: 'gh:solana-developers/solana-templates/templates/template-react-vite-tailwind-counter',
+      // },
       {
-        name: 'web3js-react-vite-tailwind-counter',
-        description: 'React with Vite, Tailwind, Anchor Counter Example, @solana/web3.js, Wallet Adapter',
-        repository: 'gh:solana-developers/solana-templates/legacy/legacy-react-vite-tailwind-counter',
+        name: 'web3js-react-vite-tailwind',
+        description: 'React with Vite, Tailwind, @solana/web3.js, Wallet Adapter',
+        repository: 'gh:solana-developers/solana-templates/legacy/legacy-react-vite-tailwind',
       },
       {
         name: 'web3js-react-vite-tailwind-basic',
@@ -93,9 +93,9 @@ export const frameworks: Framework[] = [
         repository: 'gh:solana-developers/solana-templates/legacy/legacy-react-vite-tailwind-basic',
       },
       {
-        name: 'web3js-react-vite-tailwind',
-        description: 'React with Vite, Tailwind, @solana/web3.js, Wallet Adapter',
-        repository: 'gh:solana-developers/solana-templates/legacy/legacy-react-vite-tailwind',
+        name: 'web3js-react-vite-tailwind-counter',
+        description: 'React with Vite, Tailwind, Anchor Counter Example, @solana/web3.js, Wallet Adapter',
+        repository: 'gh:solana-developers/solana-templates/legacy/legacy-react-vite-tailwind-counter',
       },
     ],
   },