diff --git a/app/components/Button/Group.vue b/app/components/Button/Group.vue
index f84d8653d1..71f280f020 100644
--- a/app/components/Button/Group.vue
+++ b/app/components/Button/Group.vue
@@ -7,7 +7,7 @@ const props = defineProps<{
 <template>
   <component
     :is="props.as || 'div'"
-    class="flex items-center shrink-0 ms-auto [&>*:not(:first-child)]:rounded-s-none [&>*:not(:first-child)]:border-s-0 [&>*:not(:last-child)]:rounded-e-none"
+    class="flex items-center shrink-0 [&>*:not(:first-child)]:rounded-s-none [&>*:not(:first-child)]:border-s-0 [&>*:not(:last-child)]:rounded-e-none"
   >
     <slot />
   </component>
diff --git a/app/components/Package/VersionDistribution.vue b/app/components/Package/VersionDistribution.vue
index a7cd1b83ad..bf6515a6c0 100644
--- a/app/components/Package/VersionDistribution.vue
+++ b/app/components/Package/VersionDistribution.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { VueUiXy } from 'vue-data-ui/vue-ui-xy'
-import type {
-  VueUiXyDatasetItem,
-  VueUiXyDatasetBarItem,
-  VueUiXyDatapointItem,
-  MinimalCustomFormatParams,
+import {
+  type VueUiXyDatasetItem,
+  type VueUiXyDatasetBarItem,
+  type VueUiXyDatapointItem,
+  type MinimalCustomFormatParams,
 } from 'vue-data-ui'
 import { useElementSize } from '@vueuse/core'
 import { useCssVariables } from '~/composables/useColors'
@@ -107,23 +107,90 @@ const sanitise = (value: string) =>
     .replace(/[\\/:"*?<>|]/g, '-')
     .replace(/\//g, '-')
 
+const { locale } = useI18n()
+function formatDate(date: Date) {
+  return date.toLocaleString(locale.value, {
+    month: 'short',
+    day: 'numeric',
+    timeZone: 'UTC',
+  })
+}
+
+const endDate = computed(() => {
+  const t = new Date()
+  return new Date(Date.UTC(t.getUTCFullYear(), t.getUTCMonth(), t.getUTCDate() - 1))
+})
+
+const startDate = computed(() => {
+  const start = new Date(endDate.value)
+  start.setUTCDate(start.getUTCDate() - 6)
+  return start
+})
+
+const { t } = useI18n()
+const dateRangeLabel = computed(() => {
+  const from = formatDate(startDate.value)
+  const to = formatDate(endDate.value)
+  const endYear = endDate.value.getUTCFullYear()
+  const startYear = startDate.value.getUTCFullYear()
+
+  if (startYear !== endYear) {
+    return t('package.versions.distribution_range_date_multiple_years', {
+      from,
+      to,
+      startYear,
+      endYear,
+    })
+  }
+
+  return t('package.versions.distribution_range_date_same_year', { from, to, endYear })
+})
+
 function buildExportFilename(extension: string): string {
-  const range = `${startDate.value}_${endDate.value}`
+  const range = dateRangeLabel.value.replaceAll(' ', '_').replaceAll(',', '')
 
   const label = props.packageName
   return `${sanitise(label ?? '')}_${range}.${extension}`
 }
 
+// VueUiXy expects one series with multiple values for bar charts
+const xyDataset = computed<VueUiXyDatasetItem[]>(() => {
+  if (!chartDataset.value.length) return []
+
+  return [
+    {
+      name: props.packageName,
+      series: chartDataset.value.map(item => item.downloads),
+      type: 'bar' as const,
+      color: accent.value,
+    },
+  ]
+})
+
+const xAxisLabels = computed(() => {
+  return chartDataset.value.map(item => item.name)
+})
+
+const hasMinimap = computed<boolean>(() => {
+  const series = xyDataset.value[0]?.series ?? []
+  return series.length > 6
+})
+
 const chartConfig = computed(() => {
   return {
-    theme: isDarkMode.value ? 'dark' : 'default',
+    theme: isDarkMode.value ? 'dark' : '',
     chart: {
-      height: isMobile.value ? 750 : 500,
+      title: {
+        text: dateRangeLabel.value,
+        fontSize: isMobile.value ? 24 : 16,
+        bold: false,
+      },
+      height: isMobile.value ? 750 : hasMinimap.value ? 500 : 611,
       backgroundColor: colors.value.bg,
       padding: {
         top: 24,
         right: 24,
-        bottom: xAxisLabels.value.length > 10 ? 84 : 72, // Space for rotated labels + watermark
+        bottom: 60,
       },
       userOptions: {
         buttons: {
@@ -267,57 +334,6 @@ const chartConfig = computed(() => {
     },
   }
 })
-
-// VueUiXy expects one series with multiple values for bar charts
-const xyDataset = computed<VueUiXyDatasetItem[]>(() => {
-  if (!chartDataset.value.length) return []
-
-  return [
-    {
-      name: props.packageName,
-      series: chartDataset.value.map(item => item.downloads),
-      type: 'bar' as const,
-      color: accent.value,
-    },
-  ]
-})
-
-const xAxisLabels = computed(() => {
-  return chartDataset.value.map(item => item.name)
-})
-
-// Handle keyboard navigation for semver group toggle
-function handleGroupingKeydown(event: KeyboardEvent) {
-  if (pending.value) return
-  if (event.key === 'Enter' || event.key === ' ') {
-    event.preventDefault()
-    // Toggle between major and minor
-    groupingMode.value = groupingMode.value === 'major' ? 'minor' : 'major'
-  } else if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') {
-    event.preventDefault()
-    // Arrow keys also toggle
-    groupingMode.value = groupingMode.value === 'major' ? 'minor' : 'major'
-  }
-}
-
-// Calculate last week date range (matches npm's "last-week" API)
-const startDate = computed(() => {
-  const today = new Date()
-  const yesterday = new Date(
-    Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate() - 1),
-  )
-  const startObj = new Date(yesterday)
-  startObj.setUTCDate(startObj.getUTCDate() - 6)
-  return startObj.toISOString().slice(0, 10)
-})
-
-const endDate = computed(() => {
-  const today = new Date()
-  const yesterday = new Date(
-    Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate() - 1),
-  )
-  return yesterday.toISOString().slice(0, 10)
-})
 </script>
 
 <template>
@@ -326,147 +342,100 @@ const endDate = computed(() => {
     id="version-distribution"
     :aria-busy="pending ? 'true' : 'false'"
   >
-    <div class="w-full mb-4 flex flex-col gap-3">
-      <div class="flex flex-col sm:flex-row gap-3 sm:gap-2 sm:items-end">
-        <div class="flex flex-col gap-1 w-fit sm:shrink-0">
-          <label class="text-3xs font-mono text-fg-subtle tracking-wide uppercase">
-            {{ $t('package.versions.distribution_title') }}
-          </label>
-          <div
-            class="flex items-center bg-bg-subtle border border-border rounded-md"
-            role="group"
-            :aria-label="$t('package.versions.distribution_title')"
-            tabindex="0"
-            @keydown="handleGroupingKeydown"
+    <div class="flex flex-col sm:flex-row gap-3 sm:gap-4 sm:items-end mb-6">
+      <div class="flex flex-col gap-1">
+        <label class="text-3xs font-mono text-fg-subtle tracking-wide uppercase">
+          {{ $t('package.versions.distribution_title') }}
+        </label>
+
+        <ButtonGroup>
+          <ButtonBase
+            @click="groupingMode = 'major'"
+            :variant="groupingMode === 'major' ? 'primary' : 'secondary'"
           >
-            <button
-              type="button"
-              :class="[
-                'px-4 py-1.75 font-mono text-sm transition-colors rounded-s-md',
-                groupingMode === 'major'
-                  ? 'bg-accent text-bg font-medium'
-                  : 'text-fg-subtle hover:text-fg hover:bg-bg-subtle/50',
-              ]"
-              :aria-pressed="groupingMode === 'major'"
-              :disabled="pending"
-              tabindex="-1"
-              @click="groupingMode = 'major'"
-            >
-              {{ $t('package.versions.grouping_major') }}
-            </button>
-            <button
-              type="button"
-              :class="[
-                'px-4 py-1.75 font-mono text-sm transition-colors rounded-e-md border-is border-border',
-                groupingMode === 'minor'
-                  ? 'bg-accent text-bg font-medium'
-                  : 'text-fg-subtle hover:text-fg hover:bg-bg-subtle/50',
-              ]"
-              :aria-pressed="groupingMode === 'minor'"
-              :disabled="pending"
-              tabindex="-1"
-              @click="groupingMode = 'minor'"
-            >
-              {{ $t('package.versions.grouping_minor') }}
-            </button>
-          </div>
-        </div>
+            {{ $t('package.versions.grouping_major') }}
+          </ButtonBase>
+
+          <ButtonBase
+            @click="groupingMode = 'minor'"
+            :variant="groupingMode === 'minor' ? 'primary' : 'secondary'"
+          >
+            {{ $t('package.versions.grouping_minor') }}
+          </ButtonBase>
+        </ButtonGroup>
+      </div>
 
-        <div class="grid grid-cols-2 gap-2 flex-1">
+      <div class="flex flex-col gap-1">
+        <label
+          class="text-3xs font-mono text-fg-subtle tracking-wide uppercase flex items-center gap-2"
+        >
+          <span>{{ $t('package.versions.grouping_versions_title') }}</span>
           <TooltipApp
-            :text="$t('package.versions.date_range_tooltip')"
-            position="bottom"
+            :text="$t('package.versions.recent_versions_only_tooltip')"
+            interactive
+            position="top"
             :to="inModal ? '#chart-modal' : undefined"
             :offset="8"
-            class="w-full"
           >
-            <div class="flex flex-col gap-1 w-full">
-              <label
-                for="versionDistStartDate"
-                class="text-3xs font-mono text-fg-subtle tracking-wide uppercase"
-              >
-                {{ $t('package.trends.start_date') }}
-              </label>
-              <div class="relative flex items-center">
-                <span
-                  class="absolute inset-is-2 i-lucide:calendar w-4 h-4 text-fg-subtle shrink-0 pointer-events-none"
-                  aria-hidden="true"
-                />
-                <InputBase
-                  id="versionDistStartDate"
-                  :model-value="startDate"
-                  disabled
-                  type="date"
-                  class="w-full min-w-0 bg-transparent ps-7"
-                  size="medium"
-                />
-              </div>
-            </div>
+            <span
+              tabindex="0"
+              class="i-lucide:info w-3.5 h-3.5 text-fg-subtle cursor-help shrink-0 rounded-sm"
+              role="img"
+              aria-label="versions info"
+            />
           </TooltipApp>
+        </label>
 
+        <ButtonGroup>
+          <ButtonBase
+            @click="showRecentOnly = false"
+            :variant="showRecentOnly ? 'secondary' : 'primary'"
+          >
+            {{ $t('package.versions.grouping_versions_all') }}
+          </ButtonBase>
+          <ButtonBase
+            @click="showRecentOnly = true"
+            :variant="showRecentOnly ? 'primary' : 'secondary'"
+          >
+            {{ $t('package.versions.grouping_versions_only_recent') }}
+          </ButtonBase>
+        </ButtonGroup>
+      </div>
+
+      <div class="flex flex-col gap-1">
+        <label
+          class="text-3xs font-mono text-fg-subtle tracking-wide uppercase flex items-center gap-2"
+        >
+          <span>{{ $t('package.versions.grouping_usage_title') }}</span>
           <TooltipApp
-            :text="$t('package.versions.date_range_tooltip')"
-            position="bottom"
+            :text="$t('package.versions.show_low_usage_tooltip')"
+            interactive
+            position="top"
             :to="inModal ? '#chart-modal' : undefined"
             :offset="8"
-            class="w-full"
           >
-            <div class="flex flex-col gap-1 w-full">
-              <label
-                for="versionDistEndDate"
-                class="text-3xs font-mono text-fg-subtle tracking-wide uppercase"
-              >
-                {{ $t('package.trends.end_date') }}
-              </label>
-              <div class="relative flex items-center">
-                <span
-                  class="absolute inset-is-2 i-lucide:calendar w-4 h-4 text-fg-subtle shrink-0 pointer-events-none"
-                  aria-hidden="true"
-                />
-                <InputBase
-                  id="versionDistEndDate"
-                  :model-value="endDate"
-                  disabled
-                  type="date"
-                  class="w-full min-w-0 bg-transparent ps-7"
-                  size="medium"
-                />
-              </div>
-            </div>
+            <span
+              tabindex="0"
+              class="i-lucide:info w-3.5 h-3.5 text-fg-subtle cursor-help shrink-0 rounded-sm"
+              role="img"
+              aria-label="versions info"
+            />
           </TooltipApp>
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-4 w-full">
-        <TooltipApp
-          :text="$t('package.versions.recent_versions_only_tooltip')"
-          position="bottom"
-          :to="inModal ? '#chart-modal' : undefined"
-          :offset="8"
-        >
-          <SettingsToggle
-            v-model="showRecentOnly"
-            :label="$t('package.versions.recent_versions_only')"
-            justify="start"
-            reverse-order
-            :class="pending ? 'opacity-50 pointer-events-none' : ''"
-          />
-        </TooltipApp>
-
-        <TooltipApp
-          :text="$t('package.versions.show_low_usage_tooltip')"
-          position="bottom"
-          :to="inModal ? '#chart-modal' : undefined"
-          :offset="8"
-        >
-          <SettingsToggle
-            v-model="showLowUsageVersions"
-            :label="$t('package.versions.show_low_usage')"
-            justify="start"
-            reverse-order
-            :class="pending ? 'opacity-50 pointer-events-none' : ''"
-          />
-        </TooltipApp>
+        </label>
+        <ButtonGroup>
+          <ButtonBase
+            @click="showLowUsageVersions = false"
+            :variant="showLowUsageVersions ? 'secondary' : 'primary'"
+          >
+            {{ $t('package.versions.grouping_usage_all') }}
+          </ButtonBase>
+          <ButtonBase
+            @click="showLowUsageVersions = true"
+            :variant="showLowUsageVersions ? 'primary' : 'secondary'"
+          >
+            {{ $t('package.versions.grouping_usage_low') }}
+          </ButtonBase>
+        </ButtonGroup>
       </div>
     </div>
 
@@ -507,7 +476,7 @@ const endDate = computed(() => {
 
             <!-- Custom legend for single series (non-interactive) -->
             <template #legend="{ legend }">
-              <div class="flex gap-4 flex-wrap justify-center">
+              <div class="flex gap-4 flex-wrap justify-center pt-8">
                 <template v-if="legend.length > 0">
                   <div class="flex gap-1 place-items-center">
                     <div class="h-3 w-3">
@@ -676,4 +645,9 @@ const endDate = computed(() => {
     left: calc(100% + 4rem) !important;
   }
 }
+
+/* Adds padding to graph title in absence of a configurable css property */
+#version-distribution .atom-title {
+  padding-top: 20px;
+}
 </style>
diff --git a/app/components/Package/Versions.vue b/app/components/Package/Versions.vue
index 674ba30b4d..505d3d8958 100644
--- a/app/components/Package/Versions.vue
+++ b/app/components/Package/Versions.vue
@@ -22,6 +22,7 @@ const props = defineProps<{
   selectedVersion?: string
 }>()
 
+const QUERY_MODAL_VALUE = 'versions'
 const chartModal = useModal('chart-modal')
 const hasDistributionModalTransitioned = shallowRef(false)
 const isDistributionModalOpen = shallowRef(false)
@@ -34,6 +35,9 @@ function clearDistributionModalFallbackTimer() {
   }
 }
 
+const router = useRouter()
+const route = useRoute()
+
 async function openDistributionModal() {
   isDistributionModalOpen.value = true
   hasDistributionModalTransitioned.value = false
@@ -41,6 +45,13 @@ async function openDistributionModal() {
   await nextTick()
   chartModal.open()
 
+  await router.replace({
+    query: {
+      ...route.query,
+      modal: QUERY_MODAL_VALUE,
+    },
+  })
+
   // Fallback: Force mount if transition event doesn't fire
   clearDistributionModalFallbackTimer()
   distributionModalFallbackTimer = setTimeout(() => {
@@ -52,10 +63,24 @@ async function openDistributionModal() {
 
 function closeDistributionModal() {
   isDistributionModalOpen.value = false
+
+  router.replace({
+    query: {
+      ...route.query,
+      modal: undefined,
+    },
+  })
+
   hasDistributionModalTransitioned.value = false
   clearDistributionModalFallbackTimer()
 }
 
+onMounted(() => {
+  if (route.query.modal === QUERY_MODAL_VALUE) {
+    openDistributionModal()
+  }
+})
+
 function handleDistributionModalTransitioned() {
   hasDistributionModalTransitioned.value = true
   clearDistributionModalFallbackTimer()
diff --git a/app/components/Settings/Toggle.client.vue b/app/components/Settings/Toggle.client.vue
index 90580d1976..5fbbbc438a 100644
--- a/app/components/Settings/Toggle.client.vue
+++ b/app/components/Settings/Toggle.client.vue
@@ -27,7 +27,7 @@ const id = useId()
 <template>
   <label
     :for="id"
-    class="grid items-center gap-4 py-1 -my-1 grid-cols-[auto_1fr_auto]"
+    class="grid items-center gap-1.5 py-1 -my-1 grid-cols-[auto_1fr_auto]"
     :class="[justify === 'start' ? 'justify-start' : '']"
     :style="
       props.reverseOrder
diff --git a/app/pages/package/[[org]]/[name].vue b/app/pages/package/[[org]]/[name].vue
index de6c114d9c..72c799c9dc 100644
--- a/app/pages/package/[[org]]/[name].vue
+++ b/app/pages/package/[[org]]/[name].vue
@@ -776,7 +776,7 @@ const showSkeleton = shallowRef(false)
             v-if="resolvedVersion"
             as="nav"
             :aria-label="$t('package.navigation')"
-            class="hidden sm:flex max-sm:flex max-sm:fixed max-sm:z-40 max-sm:inset-is-1/2 max-sm:-translate-x-1/2 max-sm:rtl:translate-x-1/2 max-sm:bg-[--bg]/90 max-sm:backdrop-blur-md max-sm:border max-sm:border-border max-sm:rounded-md max-sm:shadow-md"
+            class="hidden sm:flex max-sm:flex max-sm:fixed max-sm:z-40 max-sm:inset-is-1/2 max-sm:-translate-x-1/2 max-sm:rtl:translate-x-1/2 max-sm:bg-[--bg]/90 max-sm:backdrop-blur-md max-sm:border max-sm:border-border max-sm:rounded-md max-sm:shadow-md ms-auto"
             :style="navExtraOffsetStyle"
             :class="$style.packageNav"
           >
@@ -999,7 +999,7 @@ const showSkeleton = shallowRef(false)
                   </ClientOnly>
                 </template>
               </span>
-              <ButtonGroup v-if="dependencyCount > 0">
+              <ButtonGroup v-if="dependencyCount > 0" class="ms-auto">
                 <LinkBase
                   variant="button-secondary"
                   size="small"
diff --git a/i18n/locales/ar.json b/i18n/locales/ar.json
index cfcde29215..fac959bf7d 100644
--- a/i18n/locales/ar.json
+++ b/i18n/locales/ar.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "الإصدارات",
       "grouping_major": "رئيسي",
       "grouping_minor": "ثانوي",
-      "recent_versions_only": "الإصدارات الحديثة فقط",
       "recent_versions_only_tooltip": "إظهار الإصدارات المنشورة خلال السنة الماضية فقط.",
-      "show_low_usage": "إظهار إصدارات الاستخدام المنخفض",
       "show_low_usage_tooltip": "تضمين مجموعات الإصدارات التي تقل عن 1% من إجمالي التنزيلات.",
-      "date_range_tooltip": "أسبوع توزيعات الإصدارات الأخير فقط",
       "y_axis_label": "التنزيلات",
       "filter_placeholder": "فلترة حسب semver (مثل ^3.0.0)",
       "filter_invalid": "نطاق semver غير صالح",
diff --git a/i18n/locales/bg-BG.json b/i18n/locales/bg-BG.json
index 047c63e979..0ce376ef18 100644
--- a/i18n/locales/bg-BG.json
+++ b/i18n/locales/bg-BG.json
@@ -293,11 +293,8 @@
       "distribution_modal_title": "Версии",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Само последни версии",
       "recent_versions_only_tooltip": "Показване само на версии, публикувани през последната година.",
-      "show_low_usage": "Показване на версии с малко използване",
       "show_low_usage_tooltip": "Включване на групи версии с по-малко от 1% от общите изтегляния.",
-      "date_range_tooltip": "Само последната седмица на разпределение на версиите",
       "y_axis_label": "Изтегляния"
     },
     "dependencies": {
diff --git a/i18n/locales/cs-CZ.json b/i18n/locales/cs-CZ.json
index f935947ea9..9f9a085466 100644
--- a/i18n/locales/cs-CZ.json
+++ b/i18n/locales/cs-CZ.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "Verze",
       "grouping_major": "Hlavní",
       "grouping_minor": "Vedlejší",
-      "recent_versions_only": "Pouze nedávné verze",
       "recent_versions_only_tooltip": "Zobrazit pouze verze zveřejněné v posledním roce.",
-      "show_low_usage": "Zobrazit verze s nízkým využitím",
       "show_low_usage_tooltip": "Zahrnout skupiny verzí s méně než 1 % celkových stažení.",
-      "date_range_tooltip": "Pouze poslední týden distribuce verzí",
       "y_axis_label": "Stažení",
       "filter_placeholder": "Filtrovat podle semver (např. ^3.0.0)",
       "filter_invalid": "Neplatný rozsah semver",
diff --git a/i18n/locales/de-DE.json b/i18n/locales/de-DE.json
index 59ad603c93..cc69eb8034 100644
--- a/i18n/locales/de-DE.json
+++ b/i18n/locales/de-DE.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "Versionen",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Nur kürzliche Versionen",
       "recent_versions_only_tooltip": "Nur Versionen anzeigen, die im letzten Jahr veröffentlicht wurden.",
-      "show_low_usage": "Wenig genutzte Versionen anzeigen",
       "show_low_usage_tooltip": "Versionsgruppen anzeigen, die weniger als 1% aller Downloads ausmachen.",
-      "date_range_tooltip": "Nur die letzte Woche der Versionsverteilung",
       "y_axis_label": "Downloads",
       "filter_placeholder": "Nach SemVer filtern (z.B. ^3.0.0)",
       "filter_invalid": "Ungültiger SemVer-Bereich",
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index bd30ad8614..0b838dfe8e 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -294,13 +294,18 @@
       "view_all": "View {count} version | View all {count} versions",
       "distribution_title": "Semver Group",
       "distribution_modal_title": "Versions",
+      "distribution_range_date_same_year": "from {from} to {to}, {endYear}",
+      "distribution_range_date_multiple_years": "from {from}, {startYear} to {to}, {endYear}",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Recent versions only",
+      "grouping_versions_title": "Versions",
+      "grouping_versions_all": "All",
+      "grouping_versions_only_recent": "Only recent",
+      "grouping_usage_title": "Usage",
+      "grouping_usage_all": "All",
+      "grouping_usage_low": "Low",
       "recent_versions_only_tooltip": "Show only versions published within the last year.",
-      "show_low_usage": "Show low usage versions",
       "show_low_usage_tooltip": "Include version groups with less than 1% of total downloads.",
-      "date_range_tooltip": "Last week of version distributions only",
       "y_axis_label": "Downloads",
       "filter_placeholder": "Filter by semver (e.g. ^3.0.0)",
       "filter_invalid": "Invalid semver range",
diff --git a/i18n/locales/es.json b/i18n/locales/es.json
index 5b11285d02..6b11e188f2 100644
--- a/i18n/locales/es.json
+++ b/i18n/locales/es.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "Versiones",
       "grouping_major": "Mayor",
       "grouping_minor": "Menor",
-      "recent_versions_only": "Solo versiones recientes",
       "recent_versions_only_tooltip": "Mostrar solo versiones publicadas en el último año.",
-      "show_low_usage": "Mostrar versiones de bajo uso",
       "show_low_usage_tooltip": "Incluir grupos de versiones con menos del 1% de las descargas totales.",
-      "date_range_tooltip": "Solo la última semana de distribución de versiones",
       "y_axis_label": "Descargas",
       "filter_placeholder": "Filtrar versiones (ej: ^1.0.0, >2.0)...",
       "filter_invalid": "Rango semver inválido",
diff --git a/i18n/locales/fr-FR.json b/i18n/locales/fr-FR.json
index 9e2555190f..7b4733204d 100644
--- a/i18n/locales/fr-FR.json
+++ b/i18n/locales/fr-FR.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "Versions",
       "grouping_major": "Majeure",
       "grouping_minor": "Mineure",
-      "recent_versions_only": "Versions récentes uniquement",
       "recent_versions_only_tooltip": "Ne montrer que les versions publiées durant l'année écoulée.",
-      "show_low_usage": "Montrer les versions à faible utilisation",
       "show_low_usage_tooltip": "Inclure les groupes de versions avec moins d'1% des téléchargements totaux.",
-      "date_range_tooltip": "Versions de la dernière semaine uniquement",
       "y_axis_label": "Téléchargements",
       "filter_placeholder": "Filtrer par plage semver (ex. ^3.0.0)",
       "filter_invalid": "Plage semver invalide",
diff --git a/i18n/locales/ja-JP.json b/i18n/locales/ja-JP.json
index 112bd4a70e..39a4d20e1f 100644
--- a/i18n/locales/ja-JP.json
+++ b/i18n/locales/ja-JP.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "バージョン",
       "grouping_major": "メジャー",
       "grouping_minor": "マイナー",
-      "recent_versions_only": "最近のバージョンのみ",
       "recent_versions_only_tooltip": "過去1年以内に公開されたバージョンのみ表示します。",
-      "show_low_usage": "利用率の低いバージョンを表示",
       "show_low_usage_tooltip": "総ダウンロード数の1%未満のバージョングループも含めます。",
-      "date_range_tooltip": "直近1週間のバージョン分布のみ",
       "y_axis_label": "ダウンロード",
       "filter_placeholder": "semverで絞り込み (例: ^3.0.0)",
       "filter_invalid": "無効なsemver範囲です",
diff --git a/i18n/locales/pl-PL.json b/i18n/locales/pl-PL.json
index b30bae2bac..460a1f7bae 100644
--- a/i18n/locales/pl-PL.json
+++ b/i18n/locales/pl-PL.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "Wersje",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Tylko ostatnie wersje",
       "recent_versions_only_tooltip": "Pokaż tylko wersje opublikowane w ciągu ostatniego roku.",
-      "show_low_usage": "Pokaż wersje o niskim użyciu",
       "show_low_usage_tooltip": "Uwzględnij grupy wersji z mniej niż 1% wszystkich pobrań.",
-      "date_range_tooltip": "Tylko ostatni tydzień rozkładu wersji",
       "y_axis_label": "Pobrania",
       "filter_placeholder": "Filtruj po semver (np. ^3.0.0)",
       "filter_invalid": "Nieprawidłowy zakres semver",
diff --git a/i18n/locales/uk-UA.json b/i18n/locales/uk-UA.json
index 2b1ead44cf..fb598a8aa8 100644
--- a/i18n/locales/uk-UA.json
+++ b/i18n/locales/uk-UA.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "Версії",
       "grouping_major": "Основна",
       "grouping_minor": "Мінорна",
-      "recent_versions_only": "Лише нещодавні версії",
       "recent_versions_only_tooltip": "Показувати лише версії, опубліковані за останній рік.",
-      "show_low_usage": "Показати версії з низьким використанням",
       "show_low_usage_tooltip": "Включити групи версій з менш ніж 1% від загальних завантажень.",
-      "date_range_tooltip": "Лише останній тиждень розподілу версій",
       "y_axis_label": "Завантаження",
       "filter_placeholder": "Фільтр за semver (напр. ^3.0.0)",
       "filter_invalid": "Недійсний діапазон semver",
diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json
index 21af093e71..14593b04af 100644
--- a/i18n/locales/zh-CN.json
+++ b/i18n/locales/zh-CN.json
@@ -296,11 +296,8 @@
       "distribution_modal_title": "版本",
       "grouping_major": "主版本",
       "grouping_minor": "次版本",
-      "recent_versions_only": "仅显示最近版本",
       "recent_versions_only_tooltip": "仅显示在过去一年内发布的版本。",
-      "show_low_usage": "显示低使用率版本",
       "show_low_usage_tooltip": "包括下载量低于 1% 的版本组。",
-      "date_range_tooltip": "仅显示最近一周的版本分布情况",
       "y_axis_label": "下载量",
       "filter_placeholder": "按语义化版本过滤（例如 ^3.0.0）",
       "filter_invalid": "无效的语义化版本范围",
diff --git a/i18n/schema.json b/i18n/schema.json
index 5511972b17..2550271cbf 100644
--- a/i18n/schema.json
+++ b/i18n/schema.json
@@ -886,25 +886,40 @@
             "distribution_modal_title": {
               "type": "string"
             },
+            "distribution_range_date_same_year": {
+              "type": "string"
+            },
+            "distribution_range_date_multiple_years": {
+              "type": "string"
+            },
             "grouping_major": {
               "type": "string"
             },
             "grouping_minor": {
               "type": "string"
             },
-            "recent_versions_only": {
+            "grouping_versions_title": {
               "type": "string"
             },
-            "recent_versions_only_tooltip": {
+            "grouping_versions_all": {
               "type": "string"
             },
-            "show_low_usage": {
+            "grouping_versions_only_recent": {
               "type": "string"
             },
-            "show_low_usage_tooltip": {
+            "grouping_usage_title": {
+              "type": "string"
+            },
+            "grouping_usage_all": {
+              "type": "string"
+            },
+            "grouping_usage_low": {
               "type": "string"
             },
-            "date_range_tooltip": {
+            "recent_versions_only_tooltip": {
+              "type": "string"
+            },
+            "show_low_usage_tooltip": {
               "type": "string"
             },
             "y_axis_label": {
diff --git a/lunaria/files/ar-EG.json b/lunaria/files/ar-EG.json
index 5ff1510413..8e4705272d 100644
--- a/lunaria/files/ar-EG.json
+++ b/lunaria/files/ar-EG.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "الإصدارات",
       "grouping_major": "رئيسي",
       "grouping_minor": "ثانوي",
-      "recent_versions_only": "الإصدارات الحديثة فقط",
       "recent_versions_only_tooltip": "إظهار الإصدارات المنشورة خلال السنة الماضية فقط.",
-      "show_low_usage": "إظهار إصدارات الاستخدام المنخفض",
       "show_low_usage_tooltip": "تضمين مجموعات الإصدارات التي تقل عن 1% من إجمالي التنزيلات.",
-      "date_range_tooltip": "أسبوع توزيعات الإصدارات الأخير فقط",
       "y_axis_label": "التنزيلات",
       "filter_placeholder": "فلترة حسب semver (مثل ^3.0.0)",
       "filter_invalid": "نطاق semver غير صالح",
diff --git a/lunaria/files/bg-BG.json b/lunaria/files/bg-BG.json
index 7bcc668b4c..9dc4ba935b 100644
--- a/lunaria/files/bg-BG.json
+++ b/lunaria/files/bg-BG.json
@@ -292,11 +292,8 @@
       "distribution_modal_title": "Версии",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Само последни версии",
       "recent_versions_only_tooltip": "Показване само на версии, публикувани през последната година.",
-      "show_low_usage": "Показване на версии с малко използване",
       "show_low_usage_tooltip": "Включване на групи версии с по-малко от 1% от общите изтегляния.",
-      "date_range_tooltip": "Само последната седмица на разпределение на версиите",
       "y_axis_label": "Изтегляния"
     },
     "dependencies": {
diff --git a/lunaria/files/cs-CZ.json b/lunaria/files/cs-CZ.json
index 5edbf61205..f9b3de54f0 100644
--- a/lunaria/files/cs-CZ.json
+++ b/lunaria/files/cs-CZ.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "Verze",
       "grouping_major": "Hlavní",
       "grouping_minor": "Vedlejší",
-      "recent_versions_only": "Pouze nedávné verze",
       "recent_versions_only_tooltip": "Zobrazit pouze verze zveřejněné v posledním roce.",
-      "show_low_usage": "Zobrazit verze s nízkým využitím",
       "show_low_usage_tooltip": "Zahrnout skupiny verzí s méně než 1 % celkových stažení.",
-      "date_range_tooltip": "Pouze poslední týden distribuce verzí",
       "y_axis_label": "Stažení",
       "filter_placeholder": "Filtrovat podle semver (např. ^3.0.0)",
       "filter_invalid": "Neplatný rozsah semver",
diff --git a/lunaria/files/de-DE.json b/lunaria/files/de-DE.json
index 82fb974ea3..dfecd6dbb9 100644
--- a/lunaria/files/de-DE.json
+++ b/lunaria/files/de-DE.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "Versionen",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Nur kürzliche Versionen",
       "recent_versions_only_tooltip": "Nur Versionen anzeigen, die im letzten Jahr veröffentlicht wurden.",
-      "show_low_usage": "Wenig genutzte Versionen anzeigen",
       "show_low_usage_tooltip": "Versionsgruppen anzeigen, die weniger als 1% aller Downloads ausmachen.",
-      "date_range_tooltip": "Nur die letzte Woche der Versionsverteilung",
       "y_axis_label": "Downloads",
       "filter_placeholder": "Nach SemVer filtern (z.B. ^3.0.0)",
       "filter_invalid": "Ungültiger SemVer-Bereich",
diff --git a/lunaria/files/en-GB.json b/lunaria/files/en-GB.json
index ddfa1c6a7d..26dbb4205d 100644
--- a/lunaria/files/en-GB.json
+++ b/lunaria/files/en-GB.json
@@ -293,13 +293,18 @@
       "view_all": "View {count} version | View all {count} versions",
       "distribution_title": "Semver Group",
       "distribution_modal_title": "Versions",
+      "distribution_range_date_same_year": "from {from} to {to}, {endYear}",
+      "distribution_range_date_multiple_years": "from {from}, {startYear} to {to}, {endYear}",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Recent versions only",
+      "grouping_versions_title": "Versions",
+      "grouping_versions_all": "All",
+      "grouping_versions_only_recent": "Only recent",
+      "grouping_usage_title": "Usage",
+      "grouping_usage_all": "All",
+      "grouping_usage_low": "Low",
       "recent_versions_only_tooltip": "Show only versions published within the last year.",
-      "show_low_usage": "Show low usage versions",
       "show_low_usage_tooltip": "Include version groups with less than 1% of total downloads.",
-      "date_range_tooltip": "Last week of version distributions only",
       "y_axis_label": "Downloads",
       "filter_placeholder": "Filter by semver (e.g. ^3.0.0)",
       "filter_invalid": "Invalid semver range",
diff --git a/lunaria/files/en-US.json b/lunaria/files/en-US.json
index 42c9f3f203..1cd4294cb8 100644
--- a/lunaria/files/en-US.json
+++ b/lunaria/files/en-US.json
@@ -293,13 +293,18 @@
       "view_all": "View {count} version | View all {count} versions",
       "distribution_title": "Semver Group",
       "distribution_modal_title": "Versions",
+      "distribution_range_date_same_year": "from {from} to {to}, {endYear}",
+      "distribution_range_date_multiple_years": "from {from}, {startYear} to {to}, {endYear}",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Recent versions only",
+      "grouping_versions_title": "Versions",
+      "grouping_versions_all": "All",
+      "grouping_versions_only_recent": "Only recent",
+      "grouping_usage_title": "Usage",
+      "grouping_usage_all": "All",
+      "grouping_usage_low": "Low",
       "recent_versions_only_tooltip": "Show only versions published within the last year.",
-      "show_low_usage": "Show low usage versions",
       "show_low_usage_tooltip": "Include version groups with less than 1% of total downloads.",
-      "date_range_tooltip": "Last week of version distributions only",
       "y_axis_label": "Downloads",
       "filter_placeholder": "Filter by semver (e.g. ^3.0.0)",
       "filter_invalid": "Invalid semver range",
diff --git a/lunaria/files/es-419.json b/lunaria/files/es-419.json
index bbc6e86781..1b021e09c5 100644
--- a/lunaria/files/es-419.json
+++ b/lunaria/files/es-419.json
@@ -294,11 +294,8 @@
       "distribution_modal_title": "Versiones",
       "grouping_major": "Mayor",
       "grouping_minor": "Menor",
-      "recent_versions_only": "Solo versiones recientes",
       "recent_versions_only_tooltip": "Mostrar solo versiones publicadas en el último año.",
-      "show_low_usage": "Mostrar versiones de bajo uso",
       "show_low_usage_tooltip": "Incluir grupos de versiones con menos del 1% de las descargas totales.",
-      "date_range_tooltip": "Solo la última semana de distribución de versiones",
       "y_axis_label": "Descargas",
       "filter_placeholder": "Filtrar versiones (ej: ^1.0.0, >2.0)...",
       "filter_invalid": "Rango semver inválido",
diff --git a/lunaria/files/es-ES.json b/lunaria/files/es-ES.json
index ec4d350ff8..f89e2799dc 100644
--- a/lunaria/files/es-ES.json
+++ b/lunaria/files/es-ES.json
@@ -294,11 +294,8 @@
       "distribution_modal_title": "Versiones",
       "grouping_major": "Mayor",
       "grouping_minor": "Menor",
-      "recent_versions_only": "Solo versiones recientes",
       "recent_versions_only_tooltip": "Mostrar solo versiones publicadas en el último año.",
-      "show_low_usage": "Mostrar versiones de bajo uso",
       "show_low_usage_tooltip": "Incluir grupos de versiones con menos del 1% de las descargas totales.",
-      "date_range_tooltip": "Solo la última semana de distribución de versiones",
       "y_axis_label": "Descargas",
       "filter_placeholder": "Filtrar versiones (ej: ^1.0.0, >2.0)...",
       "filter_invalid": "Rango semver inválido",
diff --git a/lunaria/files/fr-FR.json b/lunaria/files/fr-FR.json
index 179381c21f..945b6cb6d0 100644
--- a/lunaria/files/fr-FR.json
+++ b/lunaria/files/fr-FR.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "Versions",
       "grouping_major": "Majeure",
       "grouping_minor": "Mineure",
-      "recent_versions_only": "Versions récentes uniquement",
       "recent_versions_only_tooltip": "Ne montrer que les versions publiées durant l'année écoulée.",
-      "show_low_usage": "Montrer les versions à faible utilisation",
       "show_low_usage_tooltip": "Inclure les groupes de versions avec moins d'1% des téléchargements totaux.",
-      "date_range_tooltip": "Versions de la dernière semaine uniquement",
       "y_axis_label": "Téléchargements",
       "filter_placeholder": "Filtrer par plage semver (ex. ^3.0.0)",
       "filter_invalid": "Plage semver invalide",
diff --git a/lunaria/files/ja-JP.json b/lunaria/files/ja-JP.json
index 3cb054895d..3cfc377d61 100644
--- a/lunaria/files/ja-JP.json
+++ b/lunaria/files/ja-JP.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "バージョン",
       "grouping_major": "メジャー",
       "grouping_minor": "マイナー",
-      "recent_versions_only": "最近のバージョンのみ",
       "recent_versions_only_tooltip": "過去1年以内に公開されたバージョンのみ表示します。",
-      "show_low_usage": "利用率の低いバージョンを表示",
       "show_low_usage_tooltip": "総ダウンロード数の1%未満のバージョングループも含めます。",
-      "date_range_tooltip": "直近1週間のバージョン分布のみ",
       "y_axis_label": "ダウンロード",
       "filter_placeholder": "semverで絞り込み (例: ^3.0.0)",
       "filter_invalid": "無効なsemver範囲です",
diff --git a/lunaria/files/pl-PL.json b/lunaria/files/pl-PL.json
index 240b50e0a0..a30acc07f9 100644
--- a/lunaria/files/pl-PL.json
+++ b/lunaria/files/pl-PL.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "Wersje",
       "grouping_major": "Major",
       "grouping_minor": "Minor",
-      "recent_versions_only": "Tylko ostatnie wersje",
       "recent_versions_only_tooltip": "Pokaż tylko wersje opublikowane w ciągu ostatniego roku.",
-      "show_low_usage": "Pokaż wersje o niskim użyciu",
       "show_low_usage_tooltip": "Uwzględnij grupy wersji z mniej niż 1% wszystkich pobrań.",
-      "date_range_tooltip": "Tylko ostatni tydzień rozkładu wersji",
       "y_axis_label": "Pobrania",
       "filter_placeholder": "Filtruj po semver (np. ^3.0.0)",
       "filter_invalid": "Nieprawidłowy zakres semver",
diff --git a/lunaria/files/uk-UA.json b/lunaria/files/uk-UA.json
index d6428f02dc..b763eff42c 100644
--- a/lunaria/files/uk-UA.json
+++ b/lunaria/files/uk-UA.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "Версії",
       "grouping_major": "Основна",
       "grouping_minor": "Мінорна",
-      "recent_versions_only": "Лише нещодавні версії",
       "recent_versions_only_tooltip": "Показувати лише версії, опубліковані за останній рік.",
-      "show_low_usage": "Показати версії з низьким використанням",
       "show_low_usage_tooltip": "Включити групи версій з менш ніж 1% від загальних завантажень.",
-      "date_range_tooltip": "Лише останній тиждень розподілу версій",
       "y_axis_label": "Завантаження",
       "filter_placeholder": "Фільтр за semver (напр. ^3.0.0)",
       "filter_invalid": "Недійсний діапазон semver",
diff --git a/lunaria/files/zh-CN.json b/lunaria/files/zh-CN.json
index 9e626de721..eb86181ec2 100644
--- a/lunaria/files/zh-CN.json
+++ b/lunaria/files/zh-CN.json
@@ -295,11 +295,8 @@
       "distribution_modal_title": "版本",
       "grouping_major": "主版本",
       "grouping_minor": "次版本",
-      "recent_versions_only": "仅显示最近版本",
       "recent_versions_only_tooltip": "仅显示在过去一年内发布的版本。",
-      "show_low_usage": "显示低使用率版本",
       "show_low_usage_tooltip": "包括下载量低于 1% 的版本组。",
-      "date_range_tooltip": "仅显示最近一周的版本分布情况",
       "y_axis_label": "下载量",
       "filter_placeholder": "按语义化版本过滤（例如 ^3.0.0）",
       "filter_invalid": "无效的语义化版本范围",