diff --git a/jwm-git/PKGBUILD b/jwm-git/PKGBUILD
index 6df43cd..aa01260 100644
--- a/jwm-git/PKGBUILD
+++ b/jwm-git/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=jwm-git
-pkgver=1ba58f9
+pkgver=ad367d2
 pkgrel=1
 pkgdesc="A lightweight window manager for the X11 Window System"
 arch=('i686' 'x86_64')
@@ -33,7 +33,8 @@ build() {
   patch -p1 -i $startdir/disable-pager-wheel.patch                 || return 1
   patch -p1 -i $startdir/disable-taskbar-wheel.patch               || return 1
   patch -p1 -i $startdir/fix-am-init-automake.patch                || return 1
-  patch -p1 -i $startdir/fix-minimize.patch                || return 1
+  patch -p1 -i $startdir/fix-minimize.patch                        || return 1
+  patch -p1 -i $startdir/pango.patch                               || return 1
   
   cp $startdir/x.xpm $srcdir/jwm/src/x.xpm
   ./autogen.sh
diff --git a/jwm-git/border-of-window-title.patch b/jwm-git/border-of-window-title.patch
index 61e4321..c7d2281 100644
--- a/jwm-git/border-of-window-title.patch
+++ b/jwm-git/border-of-window-title.patch
@@ -2,6 +2,23 @@ diff -cr jwm-1632/src/border.c jwm-roand/src/border.c
 *** jwm-1632/src/border.c	2012-01-27 01:04:17.000000000 +0000
 --- jwm-roand/src/border.c	2012-03-03 11:39:35.270290418 +0000
 ***************
+*** 470,476 ****
+              titley += settings.borderWidth - 1;
+           }
+           RenderString(canvas, FONT_BORDER, borderTextColor,
+!                       titlex, titley, titleWidth, np->name);
+        }
+  
+     }
+--- 470,476 ----
+              titley += settings.borderWidth - 1;
+           }
+           RenderString(canvas, FONT_BORDER, borderTextColor,
+!                       titlex, titley + 2, titleWidth, np->name);
+        }
+  
+     }
+***************
 *** 1126,1136 ****
                       Pixmap canvas, GC gc, long fg)
   {
diff --git a/jwm-git/flat-traybutton.patch b/jwm-git/flat-traybutton.patch
index d8f78f0..af0ff6f 100644
--- a/jwm-git/flat-traybutton.patch
+++ b/jwm-git/flat-traybutton.patch
@@ -32,6 +32,23 @@ diff -cr jwm-1271/src/traybutton.c jwm-roand/src/traybutton.c
 *** jwm-1271/src/traybutton.c	2015-09-12 02:46:52.000000000 +0300
 --- jwm-roand/src/traybutton.c	2015-09-18 20:06:44.000000000 +0300
 ***************
+*** 187,193 ****
+     bp = (TrayButtonType*)cp->object;
+  
+     if(bp->label) {
+!       labelWidth = GetStringWidth(FONT_TRAY, bp->label) + 6;
+        labelHeight = GetStringHeight(FONT_TRAY) + 6;
+     } else {
+        labelWidth = 4;
+--- 187,193 ----
+     bp = (TrayButtonType*)cp->object;
+  
+     if(bp->label) {
+!       labelWidth = GetStringWidth(FONT_TRAY, bp->label) + 8;
+        labelHeight = GetStringHeight(FONT_TRAY) + 6;
+     } else {
+        labelWidth = 4;
+***************
 *** 267,277 ****
      } else {
         button.type = BUTTON_TRAY;
@@ -69,7 +86,7 @@ diff -cr jwm-1271/src/button.c jwm-roand/src/button.c
         if(iconWidth > 0 && textWidth + iconWidth + 7 > width) {
            textWidth = width - iconWidth - 7;
 +          if (bp->type==BUTTON_TASK || bp->type==BUTTON_TASK_ACTIVE)
-+              textWidth = textWidth - 7; 
++              textWidth = textWidth - 3; 
         } else if(iconWidth == 0 && textWidth + 5 > width) {
            textWidth = width - 5;
         }
diff --git a/jwm-git/pango.patch b/jwm-git/pango.patch
new file mode 100644
index 0000000..ae5ca40
--- /dev/null
+++ b/jwm-git/pango.patch
@@ -0,0 +1,20 @@
+diff -cr a/src/font.c b/src/font.c
+*** a/src/font.c	2020-12-23 18:07:00.158925587 +0300
+--- b/src/font.c	2020-12-23 18:09:14.754684308 +0300
+***************
+*** 153,159 ****
+  
+           pango_layout_set_single_paragraph_mode(fonts[x], TRUE);
+           pango_layout_set_width(fonts[x], -1);
+!          pango_layout_set_ellipsize(fonts[x], PANGO_ELLIPSIZE_MIDDLE);
+  
+           metrics = pango_context_get_metrics(font_context, desc, NULL);
+           font_ascents[x] = pango_font_metrics_get_ascent(metrics);
+--- 153,159 ----
+  
+           pango_layout_set_single_paragraph_mode(fonts[x], TRUE);
+           pango_layout_set_width(fonts[x], -1);
+!          pango_layout_set_ellipsize(fonts[x], PANGO_ELLIPSIZE_END);
+  
+           metrics = pango_context_get_metrics(font_context, desc, NULL);
+           font_ascents[x] = pango_font_metrics_get_ascent(metrics);