diff --git a/demo/index.html b/demo/index.html
index 468ccd8..294e750 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -253,6 +253,24 @@ <h3 class="font-bold my-1 text-xl">Radio</h3>
 
 	<h2 class="my-2 text-3xl">Layout</h2>
 
+	<div class="my-4">
+		<div class="drawer">
+			<input id="my-drawer" type="checkbox" class="drawer-toggle" />
+			<div class="drawer-content">
+				<!-- Page content here -->
+				<label for="my-drawer" class="btn btn-primary drawer-button">Open drawer</label>
+			</div>
+			<div class="drawer-side">
+				<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay"></label>
+				<ul class="menu bg-base-200 text-base-content min-h-full w-80 p-4">
+					<!-- Sidebar content here -->
+					<li><a>Sidebar Item 1</a></li>
+					<li><a>Sidebar Item 2</a></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+
 	<div class="my-4">
 		<h3 class="font-bold my-1 text-xl">Mask</h3>
 		<img
@@ -334,11 +352,23 @@ <h3 class="font-bold my-1 text-xl">Steps</h3>
 	</div>
 
 	<div class="my-4">
-		<h3 class="font-bold my-1 text-xl">Tab</h3>
-		<div class="tabs">
-			<a class="tab tab-bordered">Tab 1</a>
-			<a class="tab tab-bordered tab-active">Tab 2</a>
-			<a class="tab tab-bordered">Tab 3</a>
+		<h3 class="font-bold my-1 text-xl">Tabs (links)</h3>
+		<div class="tabs tabs-bordered">
+			<a class="tab">Tab 1</a>
+			<a class="tab tab-active">Tab 2</a>
+			<a class="tab">Tab 3</a>
+		</div>
+	</div>
+
+	<div class="my-4">
+		<h3 class="font-bold my-1 text-xl">Tabs (input)</h3>
+		<div class="tabs tabs-bordered w-full">
+			<input type="radio" name="tabs-input-demo" role="tab" class="tab" aria-label="Tab 1" />
+			<div role="tabpanel" class="tab-content p-10">Tab 1 Content</div>
+			<input type="radio" name="tabs-input-demo" role="tab" class="tab" aria-label="Tab 2" checked />
+			<div role="tabpanel" class="tab-content p-10">Tab 2 Content</div>
+			<input type="radio" name="tabs-input-demo" role="tab" class="tab" aria-label="Tab 3" />
+			<div role="tabpanel" class="tab-content p-10">Tab 3 Content</div>
 		</div>
 	</div>
 
diff --git a/index.ts b/index.ts
index 3907cac..f5e8bd2 100644
--- a/index.ts
+++ b/index.ts
@@ -1,7 +1,7 @@
 import postcss, {type Rule, type ChildNode} from 'postcss'
 import autoprefixer from 'autoprefixer'
 import {parse, type CssInJs} from 'postcss-js'
-import {tokenize, type ClassToken} from 'parsel-js'
+import {tokenize, type ClassToken, type PseudoClassToken} from 'parsel-js'
 import type {Preset, DynamicRule, Preflight} from 'unocss'
 import camelCase from 'camelcase'
 import colors from 'daisyui/src/theming/index.js'
@@ -92,6 +92,27 @@ export const presetDaisy = (
 				? 'modal'
 				// Skip prefixes
 				: (tokens[2] as ClassToken).name
+		} else if (token.type === 'type') {
+			// default base to what is likely most specific class by finding the last one in the list
+			// input.tab:checked + .tab-content, :is(.tab-active, [aria-selected="true"]) + .tab-content -> .tab-content
+			for (var i = tokens.length - 1; i >= 0; i--) {
+				if (tokens[i]?.type === 'class') {
+					base = (tokens[i] as ClassToken).name;
+					break;
+				}
+			}
+
+			// html:has(.drawer-open.drawer-open) -> .drawer-open
+			if (base === '' && token.name === 'html') {
+				var subTokens = tokenize(node.selector)
+				if(subTokens.length == 2 && subTokens[1] && (subTokens[1] as PseudoClassToken).name === 'has') {
+					var hasToken = (subTokens[1] as PseudoClassToken);
+
+					if(hasToken.argument) {
+						base = (tokenize(hasToken.argument!)[0] as ClassToken).name;
+					}
+				}
+			}
 		}
 
 		rules.set(base, (rules.get(base) ?? '') + String(node) + '\n')
@@ -130,7 +151,7 @@ export const presetDaisy = (
 		},
 		themes,
 	)
-	
+
 	return {
 		name: 'unocss-preset-daisy',
 		preflights,