diff --git a/merge/README.txt b/merge/README.txt
index d588faf..f2698a4 100644
--- a/merge/README.txt
+++ b/merge/README.txt
@@ -20,3 +20,5 @@ dev-lang/php: пока не поддерживается из-за слотов
 
 Шаблон mail-client/claws-mail на данный момент ничего не менят, исходный
 desktop файл содержит то же самое значение
+
+Шаблон media-fonts/terminus-font требует обновления (коммит добавления 1021e1ad938492010d8950ef94e8b8631fc56ee0)
diff --git a/merge/media-fonts/.calculate_directory b/merge/media-fonts/.calculate_directory
new file mode 100644
index 0000000..8e3df7f
--- /dev/null
+++ b/merge/media-fonts/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append = 'skip' %}
diff --git a/merge/media-fonts/droid/.calculate_directory b/merge/media-fonts/droid/.calculate_directory
new file mode 100644
index 0000000..bb6fe39
--- /dev/null
+++ b/merge/media-fonts/droid/.calculate_directory
@@ -0,0 +1 @@
+{% calculate path='/etc', name='fonts', package='media-fonts/droid' %}
diff --git a/merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf b/merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
new file mode 100644
index 0000000..e45386b
--- /dev/null
+++ b/merge/media-fonts/droid/conf.d/59-google-droid-sans-mono.conf
@@ -0,0 +1 @@
+{% calculate append='remove' %}
diff --git a/merge/media-fonts/droid/conf.d/59-google-droid-sans.conf b/merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
new file mode 100644
index 0000000..e45386b
--- /dev/null
+++ b/merge/media-fonts/droid/conf.d/59-google-droid-sans.conf
@@ -0,0 +1 @@
+{% calculate append='remove' %}
diff --git a/merge/media-fonts/droid/conf.d/59-google-droid-serif.conf b/merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
new file mode 100644
index 0000000..e45386b
--- /dev/null
+++ b/merge/media-fonts/droid/conf.d/59-google-droid-serif.conf
@@ -0,0 +1 @@
+{% calculate append='remove' %}
diff --git a/merge/media-fonts/noto-emoji/.calculate_directory b/merge/media-fonts/noto-emoji/.calculate_directory
new file mode 100644
index 0000000..0ad5524
--- /dev/null
+++ b/merge/media-fonts/noto-emoji/.calculate_directory
@@ -0,0 +1,2 @@
+{% calculate path='/usr/share/fonts', name='noto-emoji', package='media-fonts/noto-emoji',
+    pkg() >= '20200317' and pkg() < '20200318' %}
diff --git a/merge/media-fonts/noto-emoji/NotoEmoji-Regular.ttf b/merge/media-fonts/noto-emoji/NotoEmoji-Regular.ttf
new file mode 100644
index 0000000..e45386b
--- /dev/null
+++ b/merge/media-fonts/noto-emoji/NotoEmoji-Regular.ttf
@@ -0,0 +1 @@
+{% calculate append='remove' %}
diff --git a/merge/media-fonts/terminus-font/.calculate_directory b/merge/media-fonts/terminus-font/.calculate_directory
new file mode 100644
index 0000000..5bca800
--- /dev/null
+++ b/merge/media-fonts/terminus-font/.calculate_directory
@@ -0,0 +1 @@
+{% calculate append='skip', package='media-fonts/terminus-font' %}
diff --git a/merge/media-fonts/terminus-font/change-unifont b/merge/media-fonts/terminus-font/change-unifont
new file mode 100644
index 0000000..51919d3
--- /dev/null
+++ b/merge/media-fonts/terminus-font/change-unifont
@@ -0,0 +1,6 @@
+{% calculate run='/bin/bash', pkg('sys-boot/grub'), action='!disk' %}
+
+{% if exists('/usr/share/fonts/terminus/ter-x18n.pcf.gz') %}
+/usr/bin/grub-mkfont -o /usr/share/grub/unicode.pf2 /usr/share/fonts/terminus/ter-x18n.pcf.gz
+{% endif %}
+exit 0