diff --git a/kitty/terminfo.py b/kitty/terminfo.py
index 7db6da729..ca286530c 100644
--- a/kitty/terminfo.py
+++ b/kitty/terminfo.py
@@ -129,8 +129,10 @@ string_capabilities = {
     # scroll up by specified amount
     'ind': r'^J',
     'indn': r'\E[%p1%dS',
-    # initialize color
+    # initialize color (set dynamic colors)
     # 'initc': r'\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\',
+    # Set all color pairs to original values
+    'oc': r'\E]104\007',
     # turn on blank mode (characters invisible)
     # 'invis': r'\E[8m',
     # Backspace
@@ -277,6 +279,7 @@ termcap_aliases.update({
     'sf': 'ind',
     'SF': 'indn',
     # 'Ic': 'initc',
+    'oc': 'oc',
     # 'mk': 'invis',
     'kb': 'kbs',
     'kl': 'kcub1',
@@ -351,8 +354,8 @@ del extra
 
 def generate_terminfo():
     ans = ['|'.join(names)]
-    ans.extend(bool_capabilities)
-    ans.extend('{}#{}'.format(k, v) for k, v in numeric_capabilities.items())
+    ans.extend(sorted(bool_capabilities))
+    ans.extend('{}#{}'.format(k, numeric_capabilities[k]) for k in sorted(numeric_capabilities))
     ans.extend('{}={}'.format(k, string_capabilities[k]) for k in sorted(string_capabilities))
     return ',\n\t'.join(ans) + ',\n'
 
diff --git a/terminfo/kitty.terminfo b/terminfo/kitty.terminfo
index 63432bd0e..2fb03b744 100644
--- a/terminfo/kitty.terminfo
+++ b/terminfo/kitty.terminfo
@@ -1,17 +1,17 @@
 xterm-kitty|KovIdTTY,
-	msgr,
+	am,
+	ccc,
+	km,
+	mc5i,
 	mir,
+	msgr,
 	npc,
 	xenl,
-	km,
-	ccc,
-	mc5i,
-	am,
 	colors#256,
-	it#8,
-	pairs#32767,
-	lines#24,
 	cols#80,
+	it#8,
+	lines#24,
+	pairs#32767,
 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G,
 	bold=\E[1m,
@@ -54,7 +54,11 @@ xterm-kitty|KovIdTTY,
 	kHOM=\E[1;2H,
 	kLFT=\E[1;2D,
 	kRIT=\E[1;2C,
+	ka1=,
+	ka3=,
 	kbs=\177,
+	kc1=,
+	kc3=,
 	kcbt=\E[Z,
 	kcub1=\EOD,
 	kcud1=\EOB,
@@ -81,6 +85,8 @@ xterm-kitty|KovIdTTY,
 	knp=\E[6~,
 	kpp=\E[5~,
 	kri=\E[1;2A,
+	kund=,
+	oc=\E]104\007,
 	rc=\E8,
 	rev=\E[7m,
 	ri=\EM,
diff --git a/terminfo/x/xterm-kitty b/terminfo/x/xterm-kitty
index 2faf77d5a..88bffb44f 100644
Binary files a/terminfo/x/xterm-kitty and b/terminfo/x/xterm-kitty differ