diff --git a/src/types/mediaQueries.ts b/src/types/mediaQueries.ts
index 7495a096..27136297 100644
--- a/src/types/mediaQueries.ts
+++ b/src/types/mediaQueries.ts
@@ -1,69 +1,10 @@
+type Optional<TOptional extends string> = TOptional | ''
+type Separator = ',' | ', '
+type MediaQuery = `[${Separator}${bigint}]` | `[${bigint}${Optional<`${Separator}${bigint}`>}]`
+type WidthMediaQuery = `:w${MediaQuery}`
+type HeightMediaQuery = `:h${MediaQuery}`
+
 // this is super weird, but number passes empty string and bigint does not
 export type MediaQueries =
-// For :w
-`:w[${bigint}]` |
-`:w[,${bigint}]` |
-`:w[, ${bigint}]` |
-`:w[${bigint},${bigint}]` |
-`:w[${bigint}, ${bigint}]` |
-
-// For :h
-`:h[${bigint}]` |
-`:h[,${bigint}]` |
-`:h[, ${bigint}]` |
-`:h[${bigint},${bigint}]` |
-`:h[${bigint}, ${bigint}]` |
-
-// Combinations of :w and :h
-`:w[${bigint}]:h[${bigint}]` |
-`:w[${bigint},${bigint}]:h[${bigint}]` |
-`:w[${bigint}, ${bigint}]:h[${bigint}]` |
-`:w[${bigint}]:h[${bigint},${bigint}]` |
-`:w[${bigint}]:h[${bigint}, ${bigint}]` |
-`:w[${bigint},${bigint}]:h[${bigint},${bigint}]` |
-`:w[${bigint}, ${bigint}]:h[${bigint},${bigint}]` |
-`:w[${bigint},${bigint}]:h[${bigint}, ${bigint}]` |
-`:w[${bigint}, ${bigint}]:h[${bigint}, ${bigint}]` |
-`:w[,${bigint}]:h[,${bigint}]` |
-`:w[, ${bigint}]:h[,${bigint}]` |
-`:w[,${bigint}]:h[, ${bigint}]` |
-`:w[, ${bigint}]:h[, ${bigint}]` |
-`:w[,${bigint}]:h[${bigint}]` |
-`:w[, ${bigint}]:h[${bigint}]` |
-`:w[${bigint}]:h[,${bigint}]` |
-`:w[${bigint}]:h[, ${bigint}]` |
-`:w[,${bigint}]:h[${bigint},${bigint}]` |
-`:w[, ${bigint}]:h[${bigint},${bigint}]` |
-`:w[,${bigint}]:h[${bigint}, ${bigint}]` |
-`:w[, ${bigint}]:h[${bigint}, ${bigint}]` |
-`:w[${bigint},${bigint}]:h[,${bigint}]` |
-`:w[${bigint}, ${bigint}]:h[,${bigint}]` |
-`:w[${bigint},${bigint}]:h[, ${bigint}]` |
-`:w[${bigint}, ${bigint}]:h[, ${bigint}]` |
-
-// Combinations of :h and :w
-`:h[${bigint}]:w[${bigint}]` |
-`:h[${bigint},${bigint}]:w[${bigint}]` |
-`:h[${bigint}, ${bigint}]:w[${bigint}]` |
-`:h[${bigint}]:w[${bigint},${bigint}]` |
-`:h[${bigint}]:w[${bigint}, ${bigint}]` |
-`:h[${bigint},${bigint}]:w[${bigint},${bigint}]` |
-`:h[${bigint}, ${bigint}]:w[${bigint},${bigint}]` |
-`:h[${bigint},${bigint}]:w[${bigint}, ${bigint}]` |
-`:h[${bigint}, ${bigint}]:w[${bigint}, ${bigint}]` |
-`:h[,${bigint}]:w[,${bigint}]` |
-`:h[, ${bigint}]:w[,${bigint}]` |
-`:h[,${bigint}]:w[, ${bigint}]` |
-`:h[, ${bigint}]:w[, ${bigint}]` |
-`:h[,${bigint}]:w[${bigint}]` |
-`:h[, ${bigint}]:w[${bigint}]` |
-`:h[${bigint}]:w[,${bigint}]` |
-`:h[${bigint}]:w[, ${bigint}]` |
-`:h[,${bigint}]:w[${bigint},${bigint}]` |
-`:h[, ${bigint}]:w[${bigint},${bigint}]` |
-`:h[,${bigint}]:w[${bigint}, ${bigint}]` |
-`:h[, ${bigint}]:w[${bigint}, ${bigint}]` |
-`:h[${bigint},${bigint}]:w[,${bigint}]` |
-`:h[${bigint}, ${bigint}]:w[,${bigint}]` |
-`:h[${bigint},${bigint}]:w[, ${bigint}]` |
-`:h[${bigint}, ${bigint}]:w[, ${bigint}]`
+    | `${WidthMediaQuery}${Optional<HeightMediaQuery>}`
+    | `${HeightMediaQuery}${Optional<WidthMediaQuery>}`