diff --git a/etc/termcap.small b/etc/termcap.small
index fa3676011291..dd22d7e3f610 100644
--- a/etc/termcap.small
+++ b/etc/termcap.small
@@ -37,7 +37,7 @@
 cons25w|ansiw|ansi80x25-raw:\
 	:al=\E[L:am:bs:NP:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:co#80:\
 	:dc=\E[P:dl=\E[M:do=\E[B:bt=\E[Z:ho=\E[H:ic=\E[@:li#25:cb=\E[1K:\
-	:ms:nd=\E[C:pt:rs=\E[x\E[m\Ec:so=\E[7m:se=\E[27m:up=\E[A:\
+	:ms:nd=\E[C:pt:rs=\Ec:so=\E[7m:se=\E[27m:up=\E[A:\
 	:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:AX:sc=\E7:rc=\E8:\
 	:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:\
 	:k9=\E[U:k;=\E[V:F1=\E[W:F2=\E[X:K2=\E[E:nw=\E[E:ec=\E[%dX:\
@@ -45,12 +45,12 @@ cons25w|ansiw|ansi80x25-raw:\
 	:kN=\E[G:kP=\E[I:@7=\E[F:kI=\E[L:kD=\177:kB=\E[Z:\
 	:IC=\E[%d@:DC=\E[%dP:SF=\E[%dS:SR=\E[%dT:AL=\E[%dL:DL=\E[%dM:\
 	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:cv=\E[%i%dd:ch=\E[%i%d`:bw:\
-	:mb=\E[5m:md=\E[1m:mh=\E[30;1m:mr=\E[7m:me=\E[m:bl=^G:ut:it#8:km:
+	:mb=\E[5m:md=\E[1m:mr=\E[7m:me=\E[m:bl=^G:ut:it#8:km:
 cons25|ansis|ansi80x25:\
 	:ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261i^U0\333y\363z\362:\
 	:tc=cons25w:
 cons25-m|ansis-mono|ansi80x25-mono:\
-	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:md@:mh@:tc=cons25:
+	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:tc=cons25:
 cons30|ansi80x30:\
 	:li#30:tc=cons25:
 cons30-m|ansi80x30-mono:\
@@ -72,7 +72,7 @@ cons25r|pc3r|ibmpc3r|cons25-koi8-r:\
 	:ac=q\200x\201m\204v\211j\205t\206n\212u\207l\202w\210k\203y\230z\231f\234~\225a\220h\221`^D.^Y-^Xi^U0\215:\
 	:kD=\E[K:tc=cons25w:
 cons25r-m|pc3r-m|ibmpc3r-mono|cons25-koi8-r-mono:\
-	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:md@:mh@:tc=cons25r:
+	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:tc=cons25r:
 cons30r|cons30-koi8-r:\
 	:li#30:tc=cons25r:
 cons30r-m|cons30-koi8-r-mono:\
@@ -94,7 +94,7 @@ cons25l2|cons25-iso8859-2:\
 	:ac=l\215m\216k\214j\213u\226t\225v\227w\230q\222x\231n\217o\220s\224p\221r\223`\201a\202f\207g\210~\237,\206.\204-\203h\212+\205i\2110\200y\232z\233{\234|\235}\236:\
 	:tc=cons25w:
 cons25l2-m|cons25-iso8859-2-mono:\
-	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:md@:mh@:tc=cons25l2:
+	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:tc=cons25l2:
 cons30l2|cons30-iso8859-2:\
 	:li#30:tc=cons25l2:
 cons30l2-m|cons30-iso8859-2-mono:\
@@ -116,7 +116,7 @@ cons25l1|cons25-iso8859-1:\
 	:ac=l\215m\216k\214j\213u\226t\225v\227w\230q\222x\231n\217o\220s\224p\221r\223`\201a\202f\207g\210~\237.^Y-^X+\253,\273i\247y\232z\233:\
 	:tc=cons25w:
 cons25l1-m|cons25-iso8859-1-mono:\
-	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:md@:mh@:tc=cons25l1:
+	:pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:tc=cons25l1:
 cons30l1|cons30-iso8859-1:\
 	:li#30:tc=cons25l1:
 cons30l1-m|cons30-iso8859-1-mono:\
@@ -138,7 +138,7 @@ dosansi|ANSI.SYS standard crt:\
 	:am:bs:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:co#80:\
 	:do=\E[B:li#25:mi:nd=\E[C:\
 	:se=\E[m:so=\E[7m:up=\E[A:us=\E[4m:ue=\E[m:\
-	:md=\E[1m:mh=\E[m:mb=\E[5m:me=\E[m:\
+	:md=\E[1m:mr=\E[7m:mb=\E[5m:me=\E[m:\
 	:kh=\EG:kb=^h:ku=\EH:kd=\EP:kl=\EK:kr=\EM:\
 	:k1=\E;:k2=\E<:k3=\E=:k4=\E>:k5=\E?:\
 	:k6=\E@:k7=\EA:k8=\EB:k9=\EC:k0=\ED: