clenup import paths

src/components/PageComponents/AppConfig/Map.tsx

@@ -2,11 +2,11 @@ import type React from "react";
 
 import { Controller, useFieldArray, useForm } from "react-hook-form";
 
-import { Button } from "@app/components/Button.js";
+import { Button } from "@app/components/form/Button.js";
+import { IconButton } from "@app/components/form/IconButton.js";
 import { InfoWrapper } from "@app/components/form/InfoWrapper.js";
 import { Input } from "@app/components/form/Input.js";
 import { Toggle } from "@app/components/form/Toggle.js";
-import { IconButton } from "@app/components/IconButton.js";
 import { useAppStore } from "@app/core/stores/appStore.js";
 import { MapValidation } from "@app/validation/appConfig/map.js";
 import { Form } from "@components/form/Form";

src/components/PageComponents/Channel.tsx

@@ -5,9 +5,9 @@ import { fromByteArray, toByteArray } from "base64-js";
 import { Controller, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 
-import { Input } from "@app/components/form/Input.js";
 import { ChannelSettingsValidation } from "@app/validation/channelSettings.js";
 import { Form } from "@components/form/Form";
+import { Input } from "@components/form/Input.js";
 import { Select } from "@components/form/Select.js";
 import { Toggle } from "@components/form/Toggle.js";
 import { useDevice } from "@core/providers/useDevice.js";

src/components/PageComponents/Connect/BLE.tsx

@@ -1,8 +1,8 @@
 import type React from "react";
 import { useCallback, useEffect, useState } from "react";
 
-import { Mono } from "@app/components/Mono.js";
-import { Button } from "@components/Button.js";
+import { Mono } from "@app/components/generic/Mono.js";
+import { Button } from "@components/form/Button.js";
 import { useAppStore } from "@core/stores/appStore.js";
 import { useDeviceStore } from "@core/stores/deviceStore.js";
 import { subscribeAll } from "@core/subscriptions.js";

src/components/PageComponents/Connect/HTTP.tsx

@@ -4,7 +4,7 @@ import { Controller, useForm, useWatch } from "react-hook-form";
 
 import { Input } from "@app/components/form/Input.js";
 import { Toggle } from "@app/components/form/Toggle.js";
-import { Button } from "@components/Button.js";
+import { Button } from "@components/form/Button.js";
 import { useAppStore } from "@core/stores/appStore.js";
 import { useDeviceStore } from "@core/stores/deviceStore.js";
 import { subscribeAll } from "@core/subscriptions.js";

src/components/PageComponents/Connect/Serial.tsx

@@ -1,8 +1,8 @@
 import type React from "react";
 import { useCallback, useEffect, useState } from "react";
 
-import { Mono } from "@app/components/Mono.js";
-import { Button } from "@components/Button.js";
+import { Mono } from "@app/components/generic/Mono.js";
+import { Button } from "@components/form/Button.js";
 import { useAppStore } from "@core/stores/appStore.js";
 import { useDeviceStore } from "@core/stores/deviceStore.js";
 import { subscribeAll } from "@core/subscriptions.js";

src/components/PageComponents/Map/MapControlls.tsx

@@ -13,7 +13,7 @@ export const MapControlls = (): JSX.Element => {
     <div className="absolute right-0 top-0 z-10 m-2">
       <div className="divide-y overflow-hidden rounded-md bg-white">
         <div
-          className="cursor-pointer p-3 hover:bg-orange-300"
+          className="cursor-pointer p-3 hover:bg-orange-200 hover:text-orange-700"
           onClick={() => {
             map?.zoomIn();
           }}
@@ -21,7 +21,7 @@ export const MapControlls = (): JSX.Element => {
           <MagnifyingGlassPlusIcon className="h-4 w-4" />
         </div>
         <div
-          className="cursor-pointer p-3 hover:bg-orange-300"
+          className="cursor-pointer p-3 hover:bg-orange-200 hover:text-orange-700"
           onClick={() => {
             map?.zoomOut();
           }}
@@ -29,7 +29,7 @@ export const MapControlls = (): JSX.Element => {
           <MagnifyingGlassMinusIcon className="h-4 w-4" />
         </div>
         <div
-          className="cursor-pointer p-3 hover:bg-orange-300"
+          className="cursor-pointer p-3 hover:bg-orange-200 hover:text-orange-700"
           onClick={() => {}}
         >
           <FiCrosshair className="h-4 w-4" />

src/components/PageComponents/Messages/ChannelChat.tsx

@@ -1,11 +1,10 @@
 import type React from "react";
 
 import { Message } from "@components/PageComponents/Messages/Message.js";
+import { MessageInput } from "@components/PageComponents/Messages/MessageInput.js";
 import { useDevice } from "@core/providers/useDevice.js";
 import type { Channel } from "@core/stores/deviceStore.js";
 
-import { MessageInput } from "./MessageInput.js";
-
 export interface ChannelChatProps {
   channel: Channel;
 }

src/components/PageComponents/Messages/MessageInput.tsx

@@ -2,8 +2,8 @@ import type React from "react";
 
 import { useForm } from "react-hook-form";
 
+import { IconButton } from "@app/components/form/IconButton.js";
 import { Input } from "@app/components/form/Input.js";
-import { IconButton } from "@app/components/IconButton.js";
 import { useDevice } from "@core/providers/useDevice.js";
 import type { Channel } from "@core/stores/deviceStore.js";
 import { MapPinIcon, PaperAirplaneIcon } from "@heroicons/react/24/outline";

src/components/PageComponents/Messages/NewLocationMessage.tsx

@@ -2,7 +2,7 @@ import type React from "react";
 
 import { Input } from "@app/components/form/Input.js";
 import { Select } from "@app/components/form/Select.js";
-import { Button } from "@components/Button.js";
+import { Button } from "@components/form/Button.js";
 import { useDevice } from "@core/providers/useDevice.js";
 import { renderOptions } from "@core/utils/selectEnumOptions.js";
 import { Protobuf } from "@meshtastic/meshtasticjs";