diff --git a/commafeed-client/src/App.tsx b/commafeed-client/src/App.tsx
index 14531e8f..a2cad195 100644
--- a/commafeed-client/src/App.tsx
+++ b/commafeed-client/src/App.tsx
@@ -26,12 +26,12 @@ import { TagDetailsPage } from "pages/app/TagDetailsPage"
 import { LoginPage } from "pages/auth/LoginPage"
 import { PasswordRecoveryPage } from "pages/auth/PasswordRecoveryPage"
 import { RegistrationPage } from "pages/auth/RegistrationPage"
+import { WelcomePage } from "pages/WelcomePage"
 import React, { useEffect } from "react"
 import ReactGA from "react-ga4"
 import { HashRouter, Navigate, Route, Routes, useLocation, useNavigate } from "react-router-dom"
 import Tinycon from "tinycon"
 import useLocalStorage from "use-local-storage"
-import { WelcomePage } from "./pages/WelcomePage"
 
 function Providers(props: { children: React.ReactNode }) {
     const preferredColorScheme = useColorScheme()
diff --git a/commafeed-client/src/components/content/FeedEntries.tsx b/commafeed-client/src/components/content/FeedEntries.tsx
index b4221eba..38edafca 100644
--- a/commafeed-client/src/components/content/FeedEntries.tsx
+++ b/commafeed-client/src/components/content/FeedEntries.tsx
@@ -17,10 +17,10 @@ import { openLinkInBackgroundTab } from "app/utils"
 import { KeyboardShortcutsHelp } from "components/KeyboardShortcutsHelp"
 import { Loader } from "components/Loader"
 import { useMousetrap } from "hooks/useMousetrap"
+import { useViewMode } from "hooks/useViewMode"
 import throttle from "lodash/throttle"
 import { useEffect } from "react"
 import InfiniteScroll from "react-infinite-scroller"
-import { useViewMode } from "../../hooks/useViewMode"
 import { FeedEntry } from "./FeedEntry"
 
 export function FeedEntries() {
diff --git a/commafeed-client/src/components/content/FeedEntry.tsx b/commafeed-client/src/components/content/FeedEntry.tsx
index 7521c34e..2c0cf6e7 100644
--- a/commafeed-client/src/components/content/FeedEntry.tsx
+++ b/commafeed-client/src/components/content/FeedEntry.tsx
@@ -4,9 +4,9 @@ import { Constants } from "app/constants"
 import { markEntry } from "app/slices/entries"
 import { useAppDispatch } from "app/store"
 import { Entry, ViewMode } from "app/types"
+import { useViewMode } from "hooks/useViewMode"
 import React from "react"
 import { useSwipeable } from "react-swipeable"
-import { useViewMode } from "../../hooks/useViewMode"
 import { FeedEntryBody } from "./FeedEntryBody"
 import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
 import { FeedEntryContextMenu, useFeedEntryContextMenu } from "./FeedEntryContextMenu"
diff --git a/commafeed-client/src/components/header/ProfileMenu.tsx b/commafeed-client/src/components/header/ProfileMenu.tsx
index 6883bcc2..b27dfbc0 100644
--- a/commafeed-client/src/components/header/ProfileMenu.tsx
+++ b/commafeed-client/src/components/header/ProfileMenu.tsx
@@ -5,6 +5,7 @@ import { client } from "app/client"
 import { redirectToAbout, redirectToAdminUsers, redirectToMetrics, redirectToSettings } from "app/slices/redirect"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { ViewMode } from "app/types"
+import { useViewMode } from "hooks/useViewMode"
 import { useState } from "react"
 import {
     TbChartLine,
@@ -20,7 +21,6 @@ import {
     TbUsers,
     TbWorldDownload,
 } from "react-icons/tb"
-import { useViewMode } from "../../hooks/useViewMode"
 
 interface ProfileMenuProps {
     control: React.ReactElement
diff --git a/commafeed-client/src/components/settings/CustomCss.tsx b/commafeed-client/src/components/settings/CustomCss.tsx
index 1d9e9e6a..c476ba8b 100644
--- a/commafeed-client/src/components/settings/CustomCss.tsx
+++ b/commafeed-client/src/components/settings/CustomCss.tsx
@@ -1,12 +1,12 @@
 import { Trans } from "@lingui/macro"
 import { Button, Group, Stack, Textarea } from "@mantine/core"
 import { useForm } from "@mantine/form"
+import { client } from "app/client"
+import { redirectToSelectedSource } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
 import { useEffect } from "react"
 import { useAsyncCallback } from "react-async-hook"
 import { TbDeviceFloppy } from "react-icons/tb"
-import { client } from "../../app/client"
-import { redirectToSelectedSource } from "../../app/slices/redirect"
-import { useAppDispatch, useAppSelector } from "../../app/store"
 
 interface FormData {
     customCss: string
diff --git a/commafeed-client/src/hooks/useViewMode.ts b/commafeed-client/src/hooks/useViewMode.ts
index 620d83df..7d67dd81 100644
--- a/commafeed-client/src/hooks/useViewMode.ts
+++ b/commafeed-client/src/hooks/useViewMode.ts
@@ -1,5 +1,5 @@
+import { ViewMode } from "app/types"
 import useLocalStorage from "use-local-storage"
-import { ViewMode } from "../app/types"
 
 export function useViewMode() {
     const [viewMode, setViewMode] = useLocalStorage<ViewMode>("view-mode", "detailed")
diff --git a/commafeed-client/src/pages/PageTitle.tsx b/commafeed-client/src/pages/PageTitle.tsx
index f17dddc5..cf573f39 100644
--- a/commafeed-client/src/pages/PageTitle.tsx
+++ b/commafeed-client/src/pages/PageTitle.tsx
@@ -1,5 +1,5 @@
 import { Center, Title } from "@mantine/core"
-import { Logo } from "../components/Logo"
+import { Logo } from "components/Logo"
 
 export function PageTitle() {
     return (
diff --git a/commafeed-client/src/pages/WelcomePage.tsx b/commafeed-client/src/pages/WelcomePage.tsx
index b35d7777..450ded6b 100644
--- a/commafeed-client/src/pages/WelcomePage.tsx
+++ b/commafeed-client/src/pages/WelcomePage.tsx
@@ -1,18 +1,18 @@
 import { t } from "@lingui/macro"
 import { Anchor, Box, Center, Container, Divider, Group, Image, Title, useMantineColorScheme } from "@mantine/core"
 import { useMediaQuery } from "@mantine/hooks"
+import { client } from "app/client"
+import { Constants } from "app/constants"
+import { redirectToLogin, redirectToRegistration, redirectToRootCategory } from "app/slices/redirect"
+import { useAppDispatch, useAppSelector } from "app/store"
 import welcome_page_dark from "assets/welcome_page_dark.png"
 import welcome_page_light from "assets/welcome_page_light.png"
+import { ActionButton } from "components/ActionButtton"
+import { ButtonToolbar } from "components/ButtonToolbar"
 import { useAsyncCallback } from "react-async-hook"
 import { SiGithub, TbKey, TbUserPlus } from "react-icons/all"
 import { SiTwitter } from "react-icons/si"
 import { TbClock, TbMoon, TbSun } from "react-icons/tb"
-import { client } from "../app/client"
-import { Constants } from "../app/constants"
-import { redirectToLogin, redirectToRegistration, redirectToRootCategory } from "../app/slices/redirect"
-import { useAppDispatch, useAppSelector } from "../app/store"
-import { ActionButton } from "../components/ActionButtton"
-import { ButtonToolbar } from "../components/ButtonToolbar"
 import { PageTitle } from "./PageTitle"
 
 export function WelcomePage() {
diff --git a/commafeed-client/src/pages/app/SettingsPage.tsx b/commafeed-client/src/pages/app/SettingsPage.tsx
index f7283485..b169170c 100644
--- a/commafeed-client/src/pages/app/SettingsPage.tsx
+++ b/commafeed-client/src/pages/app/SettingsPage.tsx
@@ -1,9 +1,9 @@
 import { Trans } from "@lingui/macro"
 import { Container, Tabs } from "@mantine/core"
+import { CustomCss } from "components/settings/CustomCss"
 import { DisplaySettings } from "components/settings/DisplaySettings"
 import { ProfileSettings } from "components/settings/ProfileSettings"
 import { TbBoxMargin, TbPhoto, TbUser } from "react-icons/tb"
-import { CustomCss } from "../../components/settings/CustomCss"
 
 export function SettingsPage() {
     return (