diff --git a/README.md b/README.md
index d0b20c811..fb96d457e 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,6 @@ A self-hosted solution to streamline and organize all aspects of your life.</p>
 ![skills](https://img.shields.io/badge/-TYPESCRIPT-FF0000?style=for-the-badge&logo=typescript&logoColor=white&color=3178C6)
 ![skills](https://img.shields.io/badge/-HTML-FF0000?style=for-the-badge&logo=html5&logoColor=white&color=orange)
 ![skills](https://img.shields.io/badge/-CSS-FF0000?style=for-the-badge&logo=css3&logoColor=white&color=blue)
-![skills](https://img.shields.io/badge/-TAILWIND_CSS-FF0000?style=for-the-badge&logo=tailwindcss&logoColor=white&color=teal)
 ![skills](https://img.shields.io/badge/-REACT_JS-FF0000?style=for-the-badge&logo=react&logoColor=white&color=skyblue)
 ![skills](https://img.shields.io/badge/-NODE_JS-FF0000?style=for-the-badge&logo=node.js&logoColor=white&color=green)
 ![skills](https://img.shields.io/badge/-EXPRESS_JS-FF0000?style=for-the-badge&logo=express&logoColor=white&color=black)
diff --git a/packages/ui/src/components/inputs/FAB/index.tsx b/packages/ui/src/components/inputs/FAB/index.tsx
index 10bfa1380..c168ca760 100644
--- a/packages/ui/src/components/inputs/FAB/index.tsx
+++ b/packages/ui/src/components/inputs/FAB/index.tsx
@@ -28,7 +28,7 @@ export function FAB({
       }
       position="fixed"
       right="1.5em"
-      zIndex="9992"
+      zIndex="10"
     >
       <Button {...props} icon={icon} />
     </Flex>
diff --git a/packages/ui/src/components/inputs/ListboxInput/components/ListboxOptions.tsx b/packages/ui/src/components/inputs/ListboxInput/components/ListboxOptions.tsx
index fef3caa34..3ca93d7e9 100644
--- a/packages/ui/src/components/inputs/ListboxInput/components/ListboxOptions.tsx
+++ b/packages/ui/src/components/inputs/ListboxInput/components/ListboxOptions.tsx
@@ -40,6 +40,9 @@ export function ListboxOptions({
           transition
           anchor={portal ? 'bottom start' : undefined}
           portal={portal}
+          onMouseDown={e => {
+            e.stopPropagation()
+          }}
         >
           {children}
         </HeadlessListboxOptions>
diff --git a/packages/ui/src/components/overlays/modals/ModalWrapper/index.tsx b/packages/ui/src/components/overlays/modals/ModalWrapper/index.tsx
index 6a2c9868d..3d8d2014e 100644
--- a/packages/ui/src/components/overlays/modals/ModalWrapper/index.tsx
+++ b/packages/ui/src/components/overlays/modals/ModalWrapper/index.tsx
@@ -69,6 +69,7 @@ export function ModalWrapper({
               sm: 'calc(100vw - 8rem)'
             }}
             minWidth="0"
+            overflowX="hidden"
             overflowY="auto"
             p="lg"
             position="absolute"
diff --git a/packages/ui/src/components/primitives/Bordered/index.tsx b/packages/ui/src/components/primitives/Bordered/index.tsx
index 9deb07b73..7cd4577fa 100644
--- a/packages/ui/src/components/primitives/Bordered/index.tsx
+++ b/packages/ui/src/components/primitives/Bordered/index.tsx
@@ -13,6 +13,7 @@ import {
   type ResponsiveProp,
   type ThemeConditionProp,
   type TokenizedCommonProps,
+  colorWithOpacity,
   normalizeResponsiveProp,
   resolveCommonSprinkleProps,
   resolveStyles
@@ -94,7 +95,7 @@ export function Bordered<T extends ElementType = 'div'>({
   ref,
   display,
   // Border props
-  borderColor = { base: 'bg-300', dark: 'bg-600' },
+  borderColor = { base: 'bg-300', dark: colorWithOpacity('bg-700', '50%') },
   borderStyle = 'solid',
   borderSide = 'all',
   borderWidth = '1px',