diff --git a/fwt/components/Display.tsx b/fwt/components/Display.tsx
deleted file mode 100644
index 3f78103..0000000
--- a/fwt/components/Display.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import '../styles/Viewport.sass'
-import { type JSXElement, Switch, Match } from 'solid-js'
-
-interface Props {
-  children: JSXElement
-  desktop?: boolean
-  tablet?: boolean
-  mobile?: boolean
-}
-
-export default (props: Props) => {
-  return (
-    <>
-      <Switch>
-        <Match when={props.desktop && !props.tablet && !props.mobile}>
-          <div class="on-desktop-only">{props.children}</div>
-        </Match>
-
-        <Match when={!props.desktop && props.tablet && !props.mobile}>
-          <div class="on-tablet-only">{props.children}</div>
-        </Match>
-
-        <Match when={!props.desktop && !props.tablet && props.mobile}>
-          <div class="on-mobile-only">{props.children}</div>
-        </Match>
-
-        <Match when={props.desktop && props.tablet && !props.mobile}>
-          <div class="on-desktop-tablet-only">{props.children}</div>
-        </Match>
-
-        <Match when={props.desktop && !props.tablet && props.mobile}>
-          <div class="on-desktop-mobile-only">{props.children}</div>
-        </Match>
-
-        <Match when={!props.desktop && props.tablet && props.mobile}>
-          <div class="on-tablet-mobile-only">{props.children}</div>
-        </Match>
-      </Switch>
-    </>
-  )
-}
diff --git a/fwt/index.ts b/fwt/index.ts
index df20152..3ef241e 100644
--- a/fwt/index.ts
+++ b/fwt/index.ts
@@ -12,7 +12,6 @@ export { default as Logo } from './components/Logo'
 export { default as Navbar } from './components/Navbar'
 export { default as Page } from './components/Page'
 export { default as Row } from './components/Row'
-export { default as Display } from './components/Display'
 
 export { default as OptimizeBackground } from './Optimizers/OptimizeBackground'
 export { default as OptimizeImage } from './Optimizers/OptimizeImage'
diff --git a/fwt/styles/Viewport.sass b/fwt/styles/Viewport.sass
deleted file mode 100644
index 1e0b5bc..0000000
--- a/fwt/styles/Viewport.sass
+++ /dev/null
@@ -1 +0,0 @@
-@use '/src/styles/classes.sass'
diff --git a/src/styles/classes.sass b/src/styles/classes.sass
index 81228b3..6379690 100644
--- a/src/styles/classes.sass
+++ b/src/styles/classes.sass
@@ -11,49 +11,61 @@
   opacity: 1
 
 .on-desktop-only
-  @media only screen and (min-width: 0px) and (max-width: view.$desktop)
+  @media only screen and (max-width: view.$desktop)
+    display: block
+
+  @media only screen and (max-width: view.$tablet)
     display: none
 
-  @media only screen and (min-width: view.$desktop)
-    display: block
+  @media only screen and (max-width: view.$mobile)
+    display: none
 
 .on-tablet-only
-  @media only screen and (min-width: 0px) and (max-width: view.$tablet)
+  @media only screen and (max-width: view.$desktop)
     display: none
 
-  @media only screen and (min-width: view.$tablet) and (max-width: view.$desktop)
+  @media only screen and (max-width: view.$tablet)
     display: block
 
-  @media only screen and (min-width: view.$desktop)
+  @media only screen and (max-width: view.$mobile)
     display: none
 
 .on-mobile-only
-  @media only screen and (min-width: view.$mobile)
-    display: block
-
-  @media only screen and (min-width: view.$tablet)
+  @media only screen and (max-width: view.$desktop)
     display: none
 
+  @media only screen and (max-width: view.$tablet)
+    display: none
+
+  @media only screen and (max-width: view.$mobile)
+    display: block
+
 .on-desktop-tablet-only
-  @media only screen and (min-width: 0px) and (max-width: view.$tablet)
-    display: none
-
-  @media only screen and (min-width: view.$tablet)
+  @media only screen and (max-width: view.$desktop)
     display: block
 
+  @media only screen and (max-width: view.$tablet)
+    display: block
+
+  @media only screen and (max-width: view.$mobile)
+    display: none
+
 .on-desktop-mobile-only
-  @media only screen and (min-width: 0px) and (max-width: view.$mobile)
+  @media only screen and (max-width: view.$desktop)
     display: block
 
-  @media only screen and (min-width: view.$mobile) and (max-width: view.$desktop)
+  @media only screen and (max-width: view.$tablet)
     display: none
 
-  @media only screen and (min-width: view.$desktop)
+  @media only screen and (max-width: view.$mobile)
     display: block
 
 .on-tablet-mobile-only
-  @media only screen and (min-width: 0px) and (max-width: view.$desktop)
+  @media only screen and (max-width: view.$desktop)
+    display: none
+
+  @media only screen and (max-width: view.$tablet)
     display: block
 
-  @media only screen and (min-width: view.$desktop)
-    display: none
+  @media only screen and (max-width: view.$mobile)
+    display: block