diff --git a/components.d.ts b/components.d.ts
index f2c3146f..7a51c8c6 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -144,7 +144,9 @@ declare module '@vue/runtime-core' {
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
     NMenu: typeof import('naive-ui')['NMenu']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
+    NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
+    NStatistic: typeof import('naive-ui')['NStatistic']
     NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default']
     OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default']
     PasswordStrengthAnalyser: typeof import('./src/tools/password-strength-analyser/password-strength-analyser.vue')['default']
diff --git a/src/tools/text-statistics/text-statistics.vue b/src/tools/text-statistics/text-statistics.vue
index 6aa29d4d..354292d8 100644
--- a/src/tools/text-statistics/text-statistics.vue
+++ b/src/tools/text-statistics/text-statistics.vue
@@ -1,19 +1,33 @@
 <script setup lang="ts">
-import { getStringSizeInBytes } from './text-statistics.service';
+import { getStringSizeInBytes, textStatistics } from './text-statistics.service';
 import { formatBytes } from '@/utils/convert';
 
 const text = ref('');
+const stats = computed(() => textStatistics(text.value));
 </script>
 
 <template>
   <c-card>
     <c-input-text v-model:value="text" multiline placeholder="Your text..." rows="5" />
 
-    <div mt-5 flex>
-      <n-statistic label="Character count" :value="text.length" flex-1 />
-      <n-statistic label="Word count" :value="text === '' ? 0 : text.split(/\s+/).length" flex-1 />
-      <n-statistic label="Line count" :value="text === '' ? 0 : text.split(/\r\n|\r|\n/).length" flex-1 />
-      <n-statistic label="Byte size" :value="formatBytes(getStringSizeInBytes(text))" flex-1 />
-    </div>
+    <n-space mt-3>
+      <n-statistic label="Character count" :value="stats.chars" />
+      <n-statistic label="Word count" :value="stats.words" />
+      <n-statistic label="Sentences count" :value="stats.sentences" />
+      <n-statistic label="Line count" :value="stats.lines" />
+      <n-statistic label="Byte size" :value="formatBytes(getStringSizeInBytes(text))" />
+    </n-space>
+
+    <n-divider />
+
+    <n-space>
+      <n-statistic label="Chars (no spaces)" :value="stats.chars_no_spaces" />
+      <n-statistic label="Uppercase chars" :value="stats.chars_upper" />
+      <n-statistic label="Lowercase chars" :value="stats.chars_lower" />
+      <n-statistic label="Digit chars" :value="stats.chars_digits" />
+      <n-statistic label="Punctuations" :value="stats.chars_puncts" />
+      <n-statistic label="Spaces chars" :value="stats.chars_spaces" />
+      <n-statistic label="Word count (no punct)" :value="stats.words_no_puncs" />
+    </n-space>
   </c-card>
 </template>