diff --git a/src/components/Content/index.tsx b/src/components/Content/index.tsx
index e1454d4..d80c2b5 100644
--- a/src/components/Content/index.tsx
+++ b/src/components/Content/index.tsx
@@ -9,11 +9,11 @@ import {
   EmbeddedWebsocketUrlParser,
   parseContent
 } from '@/lib/content-parser'
-import { getImageInfosFromEvent } from '@/lib/event'
-import { getEmojiInfosFromEmojiTags, getImageInfoFromImetaTag } from '@/lib/tag'
+import { getImetaInfosFromEvent } from '@/lib/event'
+import { getEmojiInfosFromEmojiTags, getImetaInfoFromImetaTag } from '@/lib/tag'
 import { cn } from '@/lib/utils'
 import mediaUpload from '@/services/media-upload.service'
-import { TImageInfo } from '@/types'
+import { TImetaInfo } from '@/types'
 import { Event } from 'nostr-tools'
 import { memo } from 'react'
 import {
@@ -46,30 +46,30 @@ const Content = memo(
       EmbeddedEmojiParser
     ])
 
-    const imageInfos = event ? getImageInfosFromEvent(event) : []
+    const imetaInfos = event ? getImetaInfosFromEvent(event) : []
     const allImages = nodes
       .map((node) => {
         if (node.type === 'image') {
-          const imageInfo = imageInfos.find((image) => image.url === node.data)
+          const imageInfo = imetaInfos.find((image) => image.url === node.data)
           if (imageInfo) {
             return imageInfo
           }
           const tag = mediaUpload.getImetaTagByUrl(node.data)
           return tag
-            ? getImageInfoFromImetaTag(tag, event?.pubkey)
+            ? getImetaInfoFromImetaTag(tag, event?.pubkey)
             : { url: node.data, pubkey: event?.pubkey }
         }
         if (node.type === 'images') {
           const urls = Array.isArray(node.data) ? node.data : [node.data]
           return urls.map((url) => {
-            const imageInfo = imageInfos.find((image) => image.url === url)
+            const imageInfo = imetaInfos.find((image) => image.url === url)
             return imageInfo ?? { url, pubkey: event?.pubkey }
           })
         }
         return null
       })
       .filter(Boolean)
-      .flat() as TImageInfo[]
+      .flat() as TImetaInfo[]
     let imageIndex = 0
 
     const emojiInfos = getEmojiInfosFromEmojiTags(event?.tags)
diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
index 19b4bab..c8812a5 100644
--- a/src/components/Image/index.tsx
+++ b/src/components/Image/index.tsx
@@ -1,7 +1,7 @@
 import { Skeleton } from '@/components/ui/skeleton'
 import { cn } from '@/lib/utils'
 import client from '@/services/client.service'
-import { TImageInfo } from '@/types'
+import { TImetaInfo } from '@/types'
 import { getHashFromURL } from 'blossom-client-sdk'
 import { decode } from 'blurhash'
 import { ImageOff } from 'lucide-react'
@@ -20,7 +20,7 @@ export default function Image({
     wrapper?: string
     errorPlaceholder?: string
   }
-  image: TImageInfo
+  image: TImetaInfo
   alt?: string
   hideIfError?: boolean
   errorPlaceholder?: React.ReactNode
diff --git a/src/components/ImageGallery/index.tsx b/src/components/ImageGallery/index.tsx
index b5f273e..60c042e 100644
--- a/src/components/ImageGallery/index.tsx
+++ b/src/components/ImageGallery/index.tsx
@@ -1,7 +1,7 @@
 import { randomString } from '@/lib/random'
 import { cn } from '@/lib/utils'
 import modalManager from '@/services/modal-manager.service'
-import { TImageInfo } from '@/types'
+import { TImetaInfo } from '@/types'
 import { ReactNode, useEffect, useMemo, useState } from 'react'
 import { createPortal } from 'react-dom'
 import Lightbox from 'yet-another-react-lightbox'
@@ -15,7 +15,7 @@ export default function ImageGallery({
   end = images.length
 }: {
   className?: string
-  images: TImageInfo[]
+  images: TImetaInfo[]
   start?: number
   end?: number
 }) {
diff --git a/src/components/ImageWithLightbox/index.tsx b/src/components/ImageWithLightbox/index.tsx
index 491693d..f6c0f2d 100644
--- a/src/components/ImageWithLightbox/index.tsx
+++ b/src/components/ImageWithLightbox/index.tsx
@@ -1,7 +1,7 @@
 import { randomString } from '@/lib/random'
 import { cn } from '@/lib/utils'
 import modalManager from '@/services/modal-manager.service'
-import { TImageInfo } from '@/types'
+import { TImetaInfo } from '@/types'
 import { useEffect, useMemo, useState } from 'react'
 import { createPortal } from 'react-dom'
 import Lightbox from 'yet-another-react-lightbox'
@@ -12,7 +12,7 @@ export default function ImageWithLightbox({
   image,
   className
 }: {
-  image: TImageInfo
+  image: TImetaInfo
   className?: string
 }) {
   const id = useMemo(() => `image-with-lightbox-${randomString()}`, [])
diff --git a/src/components/KindFilter/index.tsx b/src/components/KindFilter/index.tsx
index 7791696..eeecab6 100644
--- a/src/components/KindFilter/index.tsx
+++ b/src/components/KindFilter/index.tsx
@@ -3,23 +3,24 @@ import { Checkbox } from '@/components/ui/checkbox'
 import { Drawer, DrawerContent, DrawerHeader, DrawerTrigger } from '@/components/ui/drawer'
 import { Label } from '@/components/ui/label'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { DEFAULT_SHOW_KINDS, ExtendedKind } from '@/constants'
+import { ExtendedKind, SUPPORTED_KINDS } from '@/constants'
 import { cn } from '@/lib/utils'
 import { useKindFilter } from '@/providers/KindFilterProvider'
 import { useScreenSize } from '@/providers/ScreenSizeProvider'
 import { ListFilter } from 'lucide-react'
 import { kinds } from 'nostr-tools'
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-const SUPPORTED_KINDS = [
+const KIND_FILTER_OPTIONS = [
   { kindGroup: [kinds.ShortTextNote, ExtendedKind.COMMENT], label: 'Posts' },
   { kindGroup: [kinds.Repost], label: 'Reposts' },
   { kindGroup: [kinds.LongFormArticle], label: 'Articles' },
   { kindGroup: [kinds.Highlights], label: 'Highlights' },
   { kindGroup: [ExtendedKind.POLL], label: 'Polls' },
   { kindGroup: [ExtendedKind.VOICE, ExtendedKind.VOICE_COMMENT], label: 'Voice Posts' },
-  { kindGroup: [ExtendedKind.PICTURE], label: 'Photo Posts' }
+  { kindGroup: [ExtendedKind.PICTURE], label: 'Photo Posts' },
+  { kindGroup: [ExtendedKind.VIDEO, ExtendedKind.SHORT_VIDEO], label: 'Video Posts' }
 ]
 
 export default function KindFilter({
@@ -35,9 +36,6 @@ export default function KindFilter({
   const { updateShowKinds } = useKindFilter()
   const [temporaryShowKinds, setTemporaryShowKinds] = useState(showKinds)
   const [isPersistent, setIsPersistent] = useState(false)
-  const isFilterApplied = useMemo(() => {
-    return showKinds.length !== DEFAULT_SHOW_KINDS.length
-  }, [showKinds])
 
   useEffect(() => {
     setTemporaryShowKinds(showKinds)
@@ -74,7 +72,7 @@ export default function KindFilter({
     <Button
       variant="ghost"
       size="titlebar-icon"
-      className={cn('mr-1', !isFilterApplied && 'text-muted-foreground')}
+      className="mr-1"
       onClick={() => {
         if (isSmallScreen) {
           setOpen(true)
@@ -88,7 +86,7 @@ export default function KindFilter({
   const content = (
     <div>
       <div className="grid grid-cols-2 gap-2">
-        {SUPPORTED_KINDS.map(({ kindGroup, label }) => {
+        {KIND_FILTER_OPTIONS.map(({ kindGroup, label }) => {
           const checked = kindGroup.every((k) => temporaryShowKinds.includes(k))
           return (
             <div
@@ -118,7 +116,7 @@ export default function KindFilter({
         <Button
           variant="secondary"
           onClick={() => {
-            setTemporaryShowKinds(DEFAULT_SHOW_KINDS)
+            setTemporaryShowKinds(SUPPORTED_KINDS)
           }}
           className="flex-1"
         >
diff --git a/src/components/Note/PictureNote.tsx b/src/components/Note/PictureNote.tsx
new file mode 100644
index 0000000..8615e7d
--- /dev/null
+++ b/src/components/Note/PictureNote.tsx
@@ -0,0 +1,16 @@
+import { getImetaInfosFromEvent } from '@/lib/event'
+import { Event } from 'nostr-tools'
+import { useMemo } from 'react'
+import Content from '../Content'
+import ImageGallery from '../ImageGallery'
+
+export default function PictureNote({ event, className }: { event: Event; className?: string }) {
+  const imageInfos = useMemo(() => getImetaInfosFromEvent(event), [event])
+
+  return (
+    <div className={className}>
+      <Content event={event} />
+      {imageInfos.length > 0 && <ImageGallery images={imageInfos} />}
+    </div>
+  )
+}
diff --git a/src/components/Note/VideoNote.tsx b/src/components/Note/VideoNote.tsx
new file mode 100644
index 0000000..a5debe0
--- /dev/null
+++ b/src/components/Note/VideoNote.tsx
@@ -0,0 +1,18 @@
+import { getImetaInfosFromEvent } from '@/lib/event'
+import { Event } from 'nostr-tools'
+import { useMemo } from 'react'
+import Content from '../Content'
+import MediaPlayer from '../MediaPlayer'
+
+export default function VideoNote({ event, className }: { event: Event; className?: string }) {
+  const videoInfos = useMemo(() => getImetaInfosFromEvent(event), [event])
+
+  return (
+    <div className={className}>
+      <Content event={event} />
+      {videoInfos.map((video) => (
+        <MediaPlayer src={video.url} key={video.url} className="mt-2" />
+      ))}
+    </div>
+  )
+}
diff --git a/src/components/Note/index.tsx b/src/components/Note/index.tsx
index ccaa0ab..d1a9bd7 100644
--- a/src/components/Note/index.tsx
+++ b/src/components/Note/index.tsx
@@ -1,12 +1,6 @@
 import { useSecondaryPage } from '@/PageManager'
-import { ExtendedKind } from '@/constants'
-import {
-  getImageInfosFromEvent,
-  getParentBech32Id,
-  getUsingClient,
-  isNsfwEvent,
-  isPictureEvent
-} from '@/lib/event'
+import { ExtendedKind, SUPPORTED_KINDS } from '@/constants'
+import { getParentBech32Id, getUsingClient, isNsfwEvent } from '@/lib/event'
 import { toNote } from '@/lib/link'
 import { useContentPolicy } from '@/providers/ContentPolicyProvider'
 import { useMuteList } from '@/providers/MuteListProvider'
@@ -16,7 +10,6 @@ import { useMemo, useState } from 'react'
 import AudioPlayer from '../AudioPlayer'
 import Content from '../Content'
 import { FormattedTimestamp } from '../FormattedTimestamp'
-import ImageGallery from '../ImageGallery'
 import Nip05 from '../Nip05'
 import NoteOptions from '../NoteOptions'
 import ParentNotePreview from '../ParentNotePreview'
@@ -32,8 +25,10 @@ import LongFormArticle from './LongFormArticle'
 import LongFormArticlePreview from './LongFormArticlePreview'
 import MutedNote from './MutedNote'
 import NsfwNote from './NsfwNote'
+import PictureNote from './PictureNote'
 import Poll from './Poll'
 import UnknownNote from './UnknownNote'
+import VideoNote from './VideoNote'
 
 export default function Note({
   event,
@@ -56,10 +51,6 @@ export default function Note({
     () => (hideParentNotePreview ? undefined : getParentBech32Id(event)),
     [event, hideParentNotePreview]
   )
-  const imageInfos = useMemo(
-    () => (isPictureEvent(event) ? getImageInfosFromEvent(event) : []),
-    [event]
-  )
   const usingClient = useMemo(() => getUsingClient(event), [event])
   const { defaultShowNsfw } = useContentPolicy()
   const [showNsfw, setShowNsfw] = useState(false)
@@ -67,21 +58,7 @@ export default function Note({
   const [showMuted, setShowMuted] = useState(false)
 
   let content: React.ReactNode
-  if (
-    ![
-      kinds.ShortTextNote,
-      kinds.Highlights,
-      kinds.LongFormArticle,
-      kinds.LiveEvent,
-      kinds.CommunityDefinition,
-      ExtendedKind.GROUP_METADATA,
-      ExtendedKind.PICTURE,
-      ExtendedKind.COMMENT,
-      ExtendedKind.POLL,
-      ExtendedKind.VOICE,
-      ExtendedKind.VOICE_COMMENT
-    ].includes(event.kind)
-  ) {
+  if (!SUPPORTED_KINDS.includes(event.kind)) {
     content = <UnknownNote className="mt-2" event={event} />
   } else if (mutePubkeys.includes(event.pubkey) && !showMuted) {
     content = <MutedNote show={() => setShowMuted(true)} />
@@ -110,6 +87,10 @@ export default function Note({
     )
   } else if (event.kind === ExtendedKind.VOICE || event.kind === ExtendedKind.VOICE_COMMENT) {
     content = <AudioPlayer className="mt-2" src={event.content} />
+  } else if (event.kind === ExtendedKind.PICTURE) {
+    content = <PictureNote className="mt-2" event={event} />
+  } else if (event.kind === ExtendedKind.VIDEO || event.kind === ExtendedKind.SHORT_VIDEO) {
+    content = <VideoNote className="mt-2" event={event} />
   } else {
     content = <Content className="mt-2" event={event} />
   }
@@ -159,7 +140,6 @@ export default function Note({
       )}
       <IValue event={event} className="mt-2" />
       {content}
-      {imageInfos.length > 0 && <ImageGallery images={imageInfos} />}
     </div>
   )
 }
diff --git a/src/constants.ts b/src/constants.ts
index 76082bb..ad4e7b5 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -39,6 +39,7 @@ export const StorageKey = {
   DEFAULT_SHOW_NSFW: 'defaultShowNsfw',
   DISMISSED_TOO_MANY_RELAYS_ALERT: 'dismissedTooManyRelaysAlert',
   SHOW_KINDS: 'showKinds',
+  SHOW_KINDS_VERSION: 'showKindsVersion',
   MEDIA_UPLOAD_SERVICE: 'mediaUploadService', // deprecated
   HIDE_UNTRUSTED_EVENTS: 'hideUntrustedEvents', // deprecated
   ACCOUNT_RELAY_LIST_EVENT_MAP: 'accountRelayListEventMap', // deprecated
@@ -67,6 +68,8 @@ export const GROUP_METADATA_EVENT_KIND = 39000
 
 export const ExtendedKind = {
   PICTURE: 20,
+  VIDEO: 21,
+  SHORT_VIDEO: 22,
   POLL: 1068,
   POLL_RESPONSE: 1018,
   COMMENT: 1111,
@@ -77,10 +80,12 @@ export const ExtendedKind = {
   GROUP_METADATA: 39000
 }
 
-export const DEFAULT_SHOW_KINDS = [
+export const SUPPORTED_KINDS = [
   kinds.ShortTextNote,
   kinds.Repost,
   ExtendedKind.PICTURE,
+  ExtendedKind.VIDEO,
+  ExtendedKind.SHORT_VIDEO,
   ExtendedKind.POLL,
   ExtendedKind.COMMENT,
   ExtendedKind.VOICE,
diff --git a/src/i18n/locales/ar.ts b/src/i18n/locales/ar.ts
index a6657c2..b1d7c8e 100644
--- a/src/i18n/locales/ar.ts
+++ b/src/i18n/locales/ar.ts
@@ -360,6 +360,7 @@ export default {
     Polls: 'الاستطلاعات',
     'Voice Posts': 'المشاركات الصوتية',
     'Photo Posts': 'مشاركات الصور',
+    'Video Posts': 'مشاركات الفيديو',
     'Select All': 'تحديد الكل',
     'Clear All': 'مسح الكل',
     'Remember my choice': 'تذكر اختياري',
diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts
index 207a752..10aab81 100644
--- a/src/i18n/locales/de.ts
+++ b/src/i18n/locales/de.ts
@@ -367,6 +367,7 @@ export default {
     Polls: 'Umfragen',
     'Voice Posts': 'Sprachbeiträge',
     'Photo Posts': 'Fotobeiträge',
+    'Video Posts': 'Videobeiträge',
     'Select All': 'Alle auswählen',
     'Clear All': 'Alle löschen',
     'Remember my choice': 'Meine Auswahl merken',
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index 45e0a83..422eb76 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -361,6 +361,7 @@ export default {
     Polls: 'Polls',
     'Voice Posts': 'Voice Posts',
     'Photo Posts': 'Photo Posts',
+    'Video Posts': 'Video Posts',
     'Select All': 'Select All',
     'Clear All': 'Clear All',
     'Remember my choice': 'Remember my choice',
diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.ts
index e9c03fd..4fdf251 100644
--- a/src/i18n/locales/es.ts
+++ b/src/i18n/locales/es.ts
@@ -366,6 +366,7 @@ export default {
     Polls: 'Encuestas',
     'Voice Posts': 'Publicaciones de voz',
     'Photo Posts': 'Publicaciones de fotos',
+    'Video Posts': 'Publicaciones de video',
     'Select All': 'Seleccionar todo',
     'Clear All': 'Limpiar todo',
     'Remember my choice': 'Recordar mi elección',
diff --git a/src/i18n/locales/fa.ts b/src/i18n/locales/fa.ts
index 2b981ec..030ef4f 100644
--- a/src/i18n/locales/fa.ts
+++ b/src/i18n/locales/fa.ts
@@ -361,6 +361,7 @@ export default {
     Polls: 'نظرسنجی‌ها',
     'Voice Posts': 'پست‌های صوتی',
     'Photo Posts': 'پست‌های عکس',
+    'Video Posts': 'پست‌های ویدیو',
     'Select All': 'انتخاب همه',
     'Clear All': 'پاک کردن همه',
     'Remember my choice': 'انتخاب من را به خاطر بسپار',
diff --git a/src/i18n/locales/fr.ts b/src/i18n/locales/fr.ts
index bec2d9a..36b0183 100644
--- a/src/i18n/locales/fr.ts
+++ b/src/i18n/locales/fr.ts
@@ -366,6 +366,7 @@ export default {
     Polls: 'Sondages',
     'Voice Posts': 'Publications vocales',
     'Photo Posts': 'Publications photo',
+    'Video Posts': 'Publications vidéo',
     'Select All': 'Tout sélectionner',
     'Clear All': 'Tout effacer',
     'Remember my choice': 'Se souvenir de mon choix',
diff --git a/src/i18n/locales/it.ts b/src/i18n/locales/it.ts
index 158866a..f0a90ca 100644
--- a/src/i18n/locales/it.ts
+++ b/src/i18n/locales/it.ts
@@ -365,6 +365,7 @@ export default {
     Polls: 'Sondaggi',
     'Voice Posts': 'Post vocali',
     'Photo Posts': 'Post foto',
+    'Video Posts': 'Post video',
     'Select All': 'Seleziona tutto',
     'Clear All': 'Cancella tutto',
     'Remember my choice': 'Ricorda la mia scelta',
diff --git a/src/i18n/locales/ja.ts b/src/i18n/locales/ja.ts
index f363149..902c79f 100644
--- a/src/i18n/locales/ja.ts
+++ b/src/i18n/locales/ja.ts
@@ -363,6 +363,7 @@ export default {
     Polls: '投票',
     'Voice Posts': '音声投稿',
     'Photo Posts': '写真投稿',
+    'Video Posts': 'ビデオ投稿',
     'Select All': 'すべて選択',
     'Clear All': 'すべてクリア',
     'Remember my choice': '選択を記憶',
diff --git a/src/i18n/locales/ko.ts b/src/i18n/locales/ko.ts
index 059a743..5a2a4a5 100644
--- a/src/i18n/locales/ko.ts
+++ b/src/i18n/locales/ko.ts
@@ -362,6 +362,7 @@ export default {
     Polls: '투표',
     'Voice Posts': '음성 게시물',
     'Photo Posts': '사진 게시물',
+    'Video Posts': '비디오 게시물',
     'Select All': '모두 선택',
     'Clear All': '모두 지우기',
     'Remember my choice': '내 선택 기억하기',
diff --git a/src/i18n/locales/pl.ts b/src/i18n/locales/pl.ts
index 1e98771..70f9dc4 100644
--- a/src/i18n/locales/pl.ts
+++ b/src/i18n/locales/pl.ts
@@ -365,6 +365,7 @@ export default {
     Polls: 'Ankiety',
     'Voice Posts': 'Posty głosowe',
     'Photo Posts': 'Posty ze zdjęciami',
+    'Video Posts': 'Posty wideo',
     'Select All': 'Zaznacz wszystko',
     'Clear All': 'Wyczyść wszystko',
     'Remember my choice': 'Zapamiętaj mój wybór',
diff --git a/src/i18n/locales/pt-BR.ts b/src/i18n/locales/pt-BR.ts
index 7c5fd1d..3c2e8bf 100644
--- a/src/i18n/locales/pt-BR.ts
+++ b/src/i18n/locales/pt-BR.ts
@@ -364,6 +364,7 @@ export default {
     Polls: 'Enquetes',
     'Voice Posts': 'Áudios',
     'Photo Posts': 'Fotos',
+    'Video Posts': 'Vídeos',
     'Select All': 'Selecionar tudo',
     'Clear All': 'Limpar tudo',
     'Remember my choice': 'Lembrar minha escolha',
diff --git a/src/i18n/locales/pt-PT.ts b/src/i18n/locales/pt-PT.ts
index 68af624..aa92d6b 100644
--- a/src/i18n/locales/pt-PT.ts
+++ b/src/i18n/locales/pt-PT.ts
@@ -363,8 +363,9 @@ export default {
     Articles: 'Artigos',
     Highlights: 'Destaques',
     Polls: 'Inquéritos',
-    'Voice Posts': 'Publicações de voz',
-    'Photo Posts': 'Publicações de foto',
+    'Voice Posts': 'Áudios',
+    'Photo Posts': 'Fotos',
+    'Video Posts': 'Vídeos',
     'Select All': 'Seleccionar tudo',
     'Clear All': 'Limpar tudo',
     'Remember my choice': 'Lembrar a minha escolha',
diff --git a/src/i18n/locales/ru.ts b/src/i18n/locales/ru.ts
index 5d38755..8b05214 100644
--- a/src/i18n/locales/ru.ts
+++ b/src/i18n/locales/ru.ts
@@ -365,6 +365,7 @@ export default {
     Polls: 'Опросы',
     'Voice Posts': 'Голосовые посты',
     'Photo Posts': 'Фото посты',
+    'Video Posts': 'Видео посты',
     'Select All': 'Выбрать все',
     'Clear All': 'Очистить все',
     'Remember my choice': 'Запомнить мой выбор',
diff --git a/src/i18n/locales/th.ts b/src/i18n/locales/th.ts
index 476b898..23fa55c 100644
--- a/src/i18n/locales/th.ts
+++ b/src/i18n/locales/th.ts
@@ -359,6 +359,7 @@ export default {
     Polls: 'โพล',
     'Voice Posts': 'โพสต์เสียง',
     'Photo Posts': 'โพสต์รูปภาพ',
+    'Video Posts': 'โพสต์วิดีโอ',
     'Select All': 'เลือกทั้งหมด',
     'Clear All': 'ล้างทั้งหมด',
     'Remember my choice': 'จำการเลือกของฉัน',
diff --git a/src/i18n/locales/zh.ts b/src/i18n/locales/zh.ts
index 1ba1723..672e109 100644
--- a/src/i18n/locales/zh.ts
+++ b/src/i18n/locales/zh.ts
@@ -357,6 +357,7 @@ export default {
     Polls: '投票',
     'Voice Posts': '语音帖子',
     'Photo Posts': '图片帖子',
+    'Video Posts': '视频帖子',
     'Select All': '全选',
     'Clear All': '清空',
     'Remember my choice': '记住我的选择',
diff --git a/src/lib/event.ts b/src/lib/event.ts
index 64e1b12..729ea78 100644
--- a/src/lib/event.ts
+++ b/src/lib/event.ts
@@ -1,10 +1,10 @@
 import { EMBEDDED_MENTION_REGEX, ExtendedKind } from '@/constants'
 import client from '@/services/client.service'
-import { TImageInfo } from '@/types'
+import { TImetaInfo } from '@/types'
 import { LRUCache } from 'lru-cache'
 import { Event, kinds, nip19 } from 'nostr-tools'
 import {
-  getImageInfoFromImetaTag,
+  getImetaInfoFromImetaTag,
   generateBech32IdFromATag,
   generateBech32IdFromETag,
   tagNameEquals
@@ -171,15 +171,15 @@ export function getUsingClient(event: Event) {
   return event.tags.find(tagNameEquals('client'))?.[1]
 }
 
-export function getImageInfosFromEvent(event: Event) {
-  const images: TImageInfo[] = []
+export function getImetaInfosFromEvent(event: Event) {
+  const imeta: TImetaInfo[] = []
   event.tags.forEach((tag) => {
-    const imageInfo = getImageInfoFromImetaTag(tag, event.pubkey)
+    const imageInfo = getImetaInfoFromImetaTag(tag, event.pubkey)
     if (imageInfo) {
-      images.push(imageInfo)
+      imeta.push(imageInfo)
     }
   })
-  return images
+  return imeta
 }
 
 export function getEmbeddedNoteBech32Ids(event: Event) {
diff --git a/src/lib/tag.ts b/src/lib/tag.ts
index 95dbb32..a4a121c 100644
--- a/src/lib/tag.ts
+++ b/src/lib/tag.ts
@@ -1,4 +1,4 @@
-import { TEmoji, TImageInfo } from '@/types'
+import { TEmoji, TImetaInfo } from '@/types'
 import { isBlurhashValid } from 'blurhash'
 import { nip19 } from 'nostr-tools'
 import { isValidPubkey } from './pubkey'
@@ -46,19 +46,19 @@ export function generateBech32IdFromATag(tag: string[]) {
   }
 }
 
-export function getImageInfoFromImetaTag(tag: string[], pubkey?: string): TImageInfo | null {
+export function getImetaInfoFromImetaTag(tag: string[], pubkey?: string): TImetaInfo | null {
   if (tag[0] !== 'imeta') return null
   const urlItem = tag.find((item) => item.startsWith('url '))
   const url = urlItem?.slice(4)
   if (!url) return null
 
-  const image: TImageInfo = { url, pubkey }
+  const imeta: TImetaInfo = { url, pubkey }
   const blurHashItem = tag.find((item) => item.startsWith('blurhash '))
   const blurHash = blurHashItem?.slice(9)
   if (blurHash) {
     const validRes = isBlurhashValid(blurHash)
     if (validRes.result) {
-      image.blurHash = blurHash
+      imeta.blurHash = blurHash
     }
   }
   const dimItem = tag.find((item) => item.startsWith('dim '))
@@ -66,10 +66,10 @@ export function getImageInfoFromImetaTag(tag: string[], pubkey?: string): TImage
   if (dim) {
     const [width, height] = dim.split('x').map(Number)
     if (width && height) {
-      image.dim = { width, height }
+      imeta.dim = { width, height }
     }
   }
-  return image
+  return imeta
 }
 
 export function getPubkeysFromPTags(tags: string[][]) {
diff --git a/src/services/local-storage.service.ts b/src/services/local-storage.service.ts
index a042970..b933348 100644
--- a/src/services/local-storage.service.ts
+++ b/src/services/local-storage.service.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_NIP_96_SERVICE, DEFAULT_SHOW_KINDS, StorageKey } from '@/constants'
+import { DEFAULT_NIP_96_SERVICE, ExtendedKind, SUPPORTED_KINDS, StorageKey } from '@/constants'
 import { isSameAccount } from '@/lib/account'
 import { randomString } from '@/lib/random'
 import {
@@ -142,7 +142,19 @@ class LocalStorageService {
       window.localStorage.getItem(StorageKey.DISMISSED_TOO_MANY_RELAYS_ALERT) === 'true'
 
     const showKindsStr = window.localStorage.getItem(StorageKey.SHOW_KINDS)
-    this.showKinds = showKindsStr ? JSON.parse(showKindsStr) : DEFAULT_SHOW_KINDS
+    if (!showKindsStr) {
+      this.showKinds = SUPPORTED_KINDS
+    } else {
+      const showKindsVersionStr = window.localStorage.getItem(StorageKey.SHOW_KINDS_VERSION)
+      const showKindsVersion = showKindsVersionStr ? parseInt(showKindsVersionStr) : 0
+      const showKinds = JSON.parse(showKindsStr) as number[]
+      if (showKindsVersion < 1) {
+        showKinds.push(ExtendedKind.VIDEO, ExtendedKind.SHORT_VIDEO)
+      }
+      this.showKinds = showKinds
+    }
+    window.localStorage.setItem(StorageKey.SHOW_KINDS, JSON.stringify(this.showKinds))
+    window.localStorage.setItem(StorageKey.SHOW_KINDS_VERSION, '1')
 
     // Clean up deprecated data
     window.localStorage.removeItem(StorageKey.ACCOUNT_PROFILE_EVENT_MAP)
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index df86d8b..c65cc0b 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -109,7 +109,7 @@ export type TFeedInfo = { feedType: TFeedType; id?: string }
 
 export type TLanguage = 'en' | 'zh' | 'pl'
 
-export type TImageInfo = {
+export type TImetaInfo = {
   url: string
   blurHash?: string
   dim?: { width: number; height: number }