diff --git a/src/components/Article/Comment.tsx b/src/components/Article/Comment.tsx
index 102cba7c..ea40a630 100644
--- a/src/components/Article/Comment.tsx
+++ b/src/components/Article/Comment.tsx
@@ -1,10 +1,9 @@
 import './Comment.scss'
 import { Icon } from '../Nav/Icon'
 import { AuthorCard } from '../Author/Card'
-import { Show } from 'solid-js/web'
+import { Show, createMemo } from 'solid-js'
 import { clsx } from 'clsx'
 import type { Author, Reaction as Point } from '../../graphql/types.gen'
-import { createMemo } from 'solid-js'
 import { t } from '../../utils/intl'
 // import { createReaction, updateReaction, deleteReaction } from '../../stores/zine/reactions'
 import MD from './MD'
diff --git a/src/components/Author/Card.tsx b/src/components/Author/Card.tsx
index b4d3c735..28acb21c 100644
--- a/src/components/Author/Card.tsx
+++ b/src/components/Author/Card.tsx
@@ -1,9 +1,8 @@
-import { For, Show } from 'solid-js/web'
 import type { Author } from '../../graphql/types.gen'
 import Userpic from './Userpic'
 import { Icon } from '../Nav/Icon'
 import style from './Card.module.scss'
-import { createMemo } from 'solid-js'
+import { createMemo, For, Show } from 'solid-js'
 import { translit } from '../../utils/ru2en'
 import { t } from '../../utils/intl'
 import { useAuthStore } from '../../stores/auth'
diff --git a/src/components/Author/Userpic.tsx b/src/components/Author/Userpic.tsx
index b89a1a0a..0ed8744a 100644
--- a/src/components/Author/Userpic.tsx
+++ b/src/components/Author/Userpic.tsx
@@ -1,4 +1,4 @@
-import { Show } from 'solid-js/web'
+import { Show } from 'solid-js'
 import type { Author } from '../../graphql/types.gen'
 import style from './Userpic.module.scss'
 import { clsx } from 'clsx'
diff --git a/src/components/Editor/styles/Editor.scss b/src/components/Editor/styles/Editor.scss
index e0f9e4ce..c610fe93 100644
--- a/src/components/Editor/styles/Editor.scss
+++ b/src/components/Editor/styles/Editor.scss
@@ -63,7 +63,6 @@ button:focus {
   word-wrap: break-word;
   white-space: pre-wrap;
   font-variant-ligatures: none;
-  font-variant-ligatures: none;
   outline: none;
   margin: 1em 1em 1em 0;
 
diff --git a/src/components/Feed/Beside.tsx b/src/components/Feed/Beside.tsx
index c98a1146..2a3a7ce2 100644
--- a/src/components/Feed/Beside.tsx
+++ b/src/components/Feed/Beside.tsx
@@ -1,6 +1,6 @@
 // TODO: additional entities list column + article
 
-import { For, Show } from 'solid-js/web'
+import { For, Show } from 'solid-js'
 import { ArticleCard } from './Card'
 import { AuthorCard } from '../Author/Card'
 import { TopicCard } from '../Topic/Card'
diff --git a/src/components/Feed/Card.tsx b/src/components/Feed/Card.tsx
index ca378e7c..56f53f7e 100644
--- a/src/components/Feed/Card.tsx
+++ b/src/components/Feed/Card.tsx
@@ -1,6 +1,5 @@
 import { t } from '../../utils/intl'
-import { createMemo } from 'solid-js'
-import { For, Show } from 'solid-js/web'
+import { createMemo, For, Show } from 'solid-js'
 import type { Shout } from '../../graphql/types.gen'
 import { capitalize } from '../../utils'
 import { translit } from '../../utils/ru2en'
diff --git a/src/components/Feed/Group.tsx b/src/components/Feed/Group.tsx
index 0747b76c..761d6531 100644
--- a/src/components/Feed/Group.tsx
+++ b/src/components/Feed/Group.tsx
@@ -1,5 +1,5 @@
 import type { JSX } from 'solid-js/jsx-runtime'
-import { For, Show } from 'solid-js/web'
+import { For, Show } from 'solid-js'
 import type { Shout } from '../../graphql/types.gen'
 import { ArticleCard } from './Card'
 import './Group.scss'
diff --git a/src/components/Feed/List.tsx b/src/components/Feed/List.tsx
index 055378a4..88235ed3 100644
--- a/src/components/Feed/List.tsx
+++ b/src/components/Feed/List.tsx
@@ -1,9 +1,8 @@
-import { For, Suspense } from 'solid-js/web'
 import { Row1 } from './Row1'
 import { Row2 } from './Row2'
 import { Row3 } from './Row3'
 import { shuffle } from '../../utils'
-import { createMemo, createSignal } from 'solid-js'
+import { createMemo, createSignal, For, Suspense } from 'solid-js'
 import type { JSX } from 'solid-js'
 import type { Shout } from '../../graphql/types.gen'
 import './List.scss'
diff --git a/src/components/Feed/Row2.tsx b/src/components/Feed/Row2.tsx
index 274317a8..c009838b 100644
--- a/src/components/Feed/Row2.tsx
+++ b/src/components/Feed/Row2.tsx
@@ -1,5 +1,4 @@
-import { createComputed, createSignal, Show } from 'solid-js'
-import { For } from 'solid-js/web'
+import { createComputed, createSignal, Show, For } from 'solid-js'
 import type { Shout } from '../../graphql/types.gen'
 import { ArticleCard } from './Card'
 
diff --git a/src/components/Feed/Row3.tsx b/src/components/Feed/Row3.tsx
index 21ba6727..cf44806e 100644
--- a/src/components/Feed/Row3.tsx
+++ b/src/components/Feed/Row3.tsx
@@ -1,5 +1,5 @@
 import type { JSX } from 'solid-js/jsx-runtime'
-import { For } from 'solid-js/web'
+import { For } from 'solid-js'
 import type { Shout } from '../../graphql/types.gen'
 import { ArticleCard } from './Card'
 
diff --git a/src/components/Feed/Slider.tsx b/src/components/Feed/Slider.tsx
index 97079c24..686b4f1f 100644
--- a/src/components/Feed/Slider.tsx
+++ b/src/components/Feed/Slider.tsx
@@ -1,4 +1,3 @@
-import { For } from 'solid-js/web'
 import { ArticleCard } from './Card'
 import { Swiper, Navigation, Pagination } from 'swiper'
 import type { SwiperOptions } from 'swiper'
@@ -7,7 +6,7 @@ import 'swiper/scss/navigation'
 import 'swiper/scss/pagination'
 import './Slider.scss'
 import type { Shout } from '../../graphql/types.gen'
-import { createEffect, createMemo, createSignal, Show } from 'solid-js'
+import { createEffect, createMemo, createSignal, Show, For } from 'solid-js'
 import { Icon } from '../Nav/Icon'
 
 interface SliderProps {
diff --git a/src/components/Nav/AuthModal/ForgotPasswordForm.tsx b/src/components/Nav/AuthModal/ForgotPasswordForm.tsx
index 173727eb..9b056d3e 100644
--- a/src/components/Nav/AuthModal/ForgotPasswordForm.tsx
+++ b/src/components/Nav/AuthModal/ForgotPasswordForm.tsx
@@ -1,8 +1,7 @@
-import { Show } from 'solid-js/web'
 import { t } from '../../../utils/intl'
 import styles from './AuthModal.module.scss'
 import { clsx } from 'clsx'
-import { createSignal, JSX } from 'solid-js'
+import { createSignal, JSX, Show } from 'solid-js'
 import { useRouter } from '../../../stores/router'
 import { email, setEmail } from './sharedLogic'
 import type { AuthModalSearchParams } from './types'
diff --git a/src/components/Nav/AuthModal/LoginForm.tsx b/src/components/Nav/AuthModal/LoginForm.tsx
index c683b223..0b92b61c 100644
--- a/src/components/Nav/AuthModal/LoginForm.tsx
+++ b/src/components/Nav/AuthModal/LoginForm.tsx
@@ -1,11 +1,10 @@
-import { Show } from 'solid-js/web'
 import { t } from '../../../utils/intl'
 import styles from './AuthModal.module.scss'
 import { clsx } from 'clsx'
 import { SocialProviders } from './SocialProviders'
 import { signIn, signSendLink } from '../../../stores/auth'
 import { ApiError } from '../../../utils/apiClient'
-import { createSignal } from 'solid-js'
+import { createSignal, Show } from 'solid-js'
 import { isValidEmail } from './validators'
 import { email, setEmail } from './sharedLogic'
 import { useRouter } from '../../../stores/router'
diff --git a/src/components/Nav/AuthModal/RegisterForm.tsx b/src/components/Nav/AuthModal/RegisterForm.tsx
index 06adadb7..3e464b05 100644
--- a/src/components/Nav/AuthModal/RegisterForm.tsx
+++ b/src/components/Nav/AuthModal/RegisterForm.tsx
@@ -1,11 +1,10 @@
-import { Show } from 'solid-js/web'
+import { Show, createSignal } from 'solid-js'
 import type { JSX } from 'solid-js'
 import { t } from '../../../utils/intl'
 import styles from './AuthModal.module.scss'
 import { clsx } from 'clsx'
 import { SocialProviders } from './SocialProviders'
 import { checkEmail, register, useAuthStore } from '../../../stores/auth'
-import { createSignal } from 'solid-js'
 import { isValidEmail } from './validators'
 import { ApiError } from '../../../utils/apiClient'
 import { email, setEmail } from './sharedLogic'
diff --git a/src/components/Nav/Notifications.tsx b/src/components/Nav/Notifications.tsx
index c7c28215..4a53736d 100644
--- a/src/components/Nav/Notifications.tsx
+++ b/src/components/Nav/Notifications.tsx
@@ -1,6 +1,6 @@
-import { For, Portal, Show } from 'solid-js/web'
+import { Portal } from 'solid-js/web'
 import { useWarningsStore } from '../../stores/ui'
-import { createMemo } from 'solid-js'
+import { createMemo, For, Show } from 'solid-js'
 
 export default () => {
   const { warnings } = useWarningsStore()
diff --git a/src/components/Nav/ProfileModal.tsx b/src/components/Nav/ProfileModal.tsx
index 38d07060..ae32f97b 100644
--- a/src/components/Nav/ProfileModal.tsx
+++ b/src/components/Nav/ProfileModal.tsx
@@ -1,10 +1,9 @@
-import { For } from 'solid-js/web'
 import { AuthorCard } from '../Author/Card'
 import type { Author } from '../../graphql/types.gen'
 import { t } from '../../utils/intl'
 import { hideModal } from '../../stores/ui'
 import { useAuthStore, signOut } from '../../stores/auth'
-import { createMemo } from 'solid-js'
+import { createMemo, For } from 'solid-js'
 
 const quit = () => {
   signOut()
diff --git a/src/components/Topic/Card.tsx b/src/components/Topic/Card.tsx
index 31afbd10..fa738470 100644
--- a/src/components/Topic/Card.tsx
+++ b/src/components/Topic/Card.tsx
@@ -1,7 +1,6 @@
 import { capitalize, plural } from '../../utils'
-import { Show } from 'solid-js/web'
 import style from './Card.module.scss'
-import { createMemo } from 'solid-js'
+import { createMemo, Show } from 'solid-js'
 import type { Topic } from '../../graphql/types.gen'
 import { FollowingEntity } from '../../graphql/types.gen'
 import { t } from '../../utils/intl'
diff --git a/src/components/Topic/Full.tsx b/src/components/Topic/Full.tsx
index 7219c961..5923ead9 100644
--- a/src/components/Topic/Full.tsx
+++ b/src/components/Topic/Full.tsx
@@ -1,5 +1,4 @@
-import { createMemo } from 'solid-js'
-import { Show } from 'solid-js/web'
+import { createMemo, Show } from 'solid-js'
 import type { Topic } from '../../graphql/types.gen'
 import { FollowingEntity } from '../../graphql/types.gen'
 import './Full.scss'