diff --git a/src/term.h b/src/term.h
index 251b475..e67ed4f 100644
--- a/src/term.h
+++ b/src/term.h
@@ -92,8 +92,8 @@
     KS_8B,	/* set background color (RGB) */
     KS_CBE,	/* enable bracketed paste mode */
     KS_CBD,	/* disable bracketed paste mode */
-    KS_CPS,	/* start of brackted paste */
-    KS_CPE	/* end of brackted paste */
+    KS_CPS,	/* start of bracketed paste */
+    KS_CPE	/* end of bracketed paste */
 };
 
 #define KS_LAST	    KS_CPE
@@ -111,73 +111,73 @@
 /*
  * strings used for terminal
  */
-#define T_NAME	(term_str(KS_NAME))	/* terminal name */
-#define T_CE	(term_str(KS_CE))	/* clear to end of line */
-#define T_AL	(term_str(KS_AL))	/* add new blank line */
-#define T_CAL	(term_str(KS_CAL))	/* add number of blank lines */
-#define T_DL	(term_str(KS_DL))	/* delete line */
-#define T_CDL	(term_str(KS_CDL))	/* delete number of lines */
-#define T_CS	(term_str(KS_CS))	/* scroll region */
-#define T_CSV	(term_str(KS_CSV))	/* scroll region vertical */
-#define T_CL	(term_str(KS_CL))	/* clear screen */
-#define T_CD	(term_str(KS_CD))	/* clear to end of display */
-#define T_UT	(term_str(KS_UT))	/* clearing uses background color */
-#define T_DA	(term_str(KS_DA))	/* text may be scrolled down from up */
-#define T_DB	(term_str(KS_DB))	/* text may be scrolled up from down */
-#define T_VI	(term_str(KS_VI))	/* cursor invisible */
-#define T_VE	(term_str(KS_VE))	/* cursor visible */
-#define T_VS	(term_str(KS_VS))	/* cursor very visible */
-#define T_ME	(term_str(KS_ME))	/* normal mode */
-#define T_MR	(term_str(KS_MR))	/* reverse mode */
-#define T_MD	(term_str(KS_MD))	/* bold mode */
-#define T_SE	(term_str(KS_SE))	/* normal mode */
-#define T_SO	(term_str(KS_SO))	/* standout mode */
-#define T_CZH	(term_str(KS_CZH))	/* italic mode start */
-#define T_CZR	(term_str(KS_CZR))	/* italic mode end */
-#define T_UE	(term_str(KS_UE))	/* exit underscore (underline) mode */
-#define T_US	(term_str(KS_US))	/* underscore (underline) mode */
-#define T_UCE	(term_str(KS_UCE))	/* exit undercurl mode */
-#define T_UCS	(term_str(KS_UCS))	/* undercurl mode */
-#define T_MS	(term_str(KS_MS))	/* save to move cur in reverse mode */
-#define T_CM	(term_str(KS_CM))	/* cursor motion */
-#define T_SR	(term_str(KS_SR))	/* scroll reverse (backward) */
-#define T_CRI	(term_str(KS_CRI))	/* cursor number of chars right */
-#define T_VB	(term_str(KS_VB))	/* visual bell */
-#define T_KS	(term_str(KS_KS))	/* put term in "keypad transmit" mode */
-#define T_KE	(term_str(KS_KE))	/* out of "keypad transmit" mode */
-#define T_TI	(term_str(KS_TI))	/* put terminal in termcap mode */
-#define T_TE	(term_str(KS_TE))	/* out of termcap mode */
-#define T_BC	(term_str(KS_BC))	/* backspace character */
-#define T_CCS	(term_str(KS_CCS))	/* cur is relative to scroll region */
-#define T_CCO	(term_str(KS_CCO))	/* number of colors */
-#define T_CSF	(term_str(KS_CSF))	/* set foreground color */
-#define T_CSB	(term_str(KS_CSB))	/* set background color */
-#define T_XS	(term_str(KS_XS))	/* standout not erased by overwriting */
-#define T_XN	(term_str(KS_XN))	/* newline glitch */
-#define T_MB	(term_str(KS_MB))	/* blink mode */
-#define T_CAF	(term_str(KS_CAF))	/* set foreground color (ANSI) */
-#define T_CAB	(term_str(KS_CAB))	/* set background color (ANSI) */
-#define T_LE	(term_str(KS_LE))	/* cursor left */
-#define T_ND	(term_str(KS_ND))	/* cursor right */
-#define T_CIS	(term_str(KS_CIS))	/* set icon text start */
-#define T_CIE	(term_str(KS_CIE))	/* set icon text end */
-#define T_TS	(term_str(KS_TS))	/* set window title start */
-#define T_FS	(term_str(KS_FS))	/* set window title end */
-#define T_CWP	(term_str(KS_CWP))	/* window position */
-#define T_CWS	(term_str(KS_CWS))	/* window size */
-#define T_CSI	(term_str(KS_CSI))	/* start insert mode */
-#define T_CEI	(term_str(KS_CEI))	/* end insert mode */
-#define T_CSR	(term_str(KS_CSR))	/* start replace mode */
-#define T_CRV	(term_str(KS_CRV))	/* request version string */
-#define T_RBG	(term_str(KS_RBG))	/* request background RGB */
-#define T_OP	(term_str(KS_OP))	/* original color pair */
-#define T_U7	(term_str(KS_U7))	/* request cursor position */
-#define T_8F	(term_str(KS_8F))	/* set foreground color (RGB) */
-#define T_8B	(term_str(KS_8B))	/* set background color (RGB) */
-#define T_BE	(term_str(KS_CBE))	/* enable bracketed paste mode */
-#define T_BD	(term_str(KS_CBD))	/* disable bracketed paste mode */
-#define T_PS	(term_str(KS_CPS))	/* start of bracketed paste */
-#define T_PE	(term_str(KS_CPE))	/* end of bracketed paste */
+#define T_NAME	(TERM_STR(KS_NAME))	/* terminal name */
+#define T_CE	(TERM_STR(KS_CE))	/* clear to end of line */
+#define T_AL	(TERM_STR(KS_AL))	/* add new blank line */
+#define T_CAL	(TERM_STR(KS_CAL))	/* add number of blank lines */
+#define T_DL	(TERM_STR(KS_DL))	/* delete line */
+#define T_CDL	(TERM_STR(KS_CDL))	/* delete number of lines */
+#define T_CS	(TERM_STR(KS_CS))	/* scroll region */
+#define T_CSV	(TERM_STR(KS_CSV))	/* scroll region vertical */
+#define T_CL	(TERM_STR(KS_CL))	/* clear screen */
+#define T_CD	(TERM_STR(KS_CD))	/* clear to end of display */
+#define T_UT	(TERM_STR(KS_UT))	/* clearing uses background color */
+#define T_DA	(TERM_STR(KS_DA))	/* text may be scrolled down from up */
+#define T_DB	(TERM_STR(KS_DB))	/* text may be scrolled up from down */
+#define T_VI	(TERM_STR(KS_VI))	/* cursor invisible */
+#define T_VE	(TERM_STR(KS_VE))	/* cursor visible */
+#define T_VS	(TERM_STR(KS_VS))	/* cursor very visible */
+#define T_ME	(TERM_STR(KS_ME))	/* normal mode */
+#define T_MR	(TERM_STR(KS_MR))	/* reverse mode */
+#define T_MD	(TERM_STR(KS_MD))	/* bold mode */
+#define T_SE	(TERM_STR(KS_SE))	/* normal mode */
+#define T_SO	(TERM_STR(KS_SO))	/* standout mode */
+#define T_CZH	(TERM_STR(KS_CZH))	/* italic mode start */
+#define T_CZR	(TERM_STR(KS_CZR))	/* italic mode end */
+#define T_UE	(TERM_STR(KS_UE))	/* exit underscore (underline) mode */
+#define T_US	(TERM_STR(KS_US))	/* underscore (underline) mode */
+#define T_UCE	(TERM_STR(KS_UCE))	/* exit undercurl mode */
+#define T_UCS	(TERM_STR(KS_UCS))	/* undercurl mode */
+#define T_MS	(TERM_STR(KS_MS))	/* save to move cur in reverse mode */
+#define T_CM	(TERM_STR(KS_CM))	/* cursor motion */
+#define T_SR	(TERM_STR(KS_SR))	/* scroll reverse (backward) */
+#define T_CRI	(TERM_STR(KS_CRI))	/* cursor number of chars right */
+#define T_VB	(TERM_STR(KS_VB))	/* visual bell */
+#define T_KS	(TERM_STR(KS_KS))	/* put term in "keypad transmit" mode */
+#define T_KE	(TERM_STR(KS_KE))	/* out of "keypad transmit" mode */
+#define T_TI	(TERM_STR(KS_TI))	/* put terminal in termcap mode */
+#define T_TE	(TERM_STR(KS_TE))	/* out of termcap mode */
+#define T_BC	(TERM_STR(KS_BC))	/* backspace character */
+#define T_CCS	(TERM_STR(KS_CCS))	/* cur is relative to scroll region */
+#define T_CCO	(TERM_STR(KS_CCO))	/* number of colors */
+#define T_CSF	(TERM_STR(KS_CSF))	/* set foreground color */
+#define T_CSB	(TERM_STR(KS_CSB))	/* set background color */
+#define T_XS	(TERM_STR(KS_XS))	/* standout not erased by overwriting */
+#define T_XN	(TERM_STR(KS_XN))	/* newline glitch */
+#define T_MB	(TERM_STR(KS_MB))	/* blink mode */
+#define T_CAF	(TERM_STR(KS_CAF))	/* set foreground color (ANSI) */
+#define T_CAB	(TERM_STR(KS_CAB))	/* set background color (ANSI) */
+#define T_LE	(TERM_STR(KS_LE))	/* cursor left */
+#define T_ND	(TERM_STR(KS_ND))	/* cursor right */
+#define T_CIS	(TERM_STR(KS_CIS))	/* set icon text start */
+#define T_CIE	(TERM_STR(KS_CIE))	/* set icon text end */
+#define T_TS	(TERM_STR(KS_TS))	/* set window title start */
+#define T_FS	(TERM_STR(KS_FS))	/* set window title end */
+#define T_CWP	(TERM_STR(KS_CWP))	/* window position */
+#define T_CWS	(TERM_STR(KS_CWS))	/* window size */
+#define T_CSI	(TERM_STR(KS_CSI))	/* start insert mode */
+#define T_CEI	(TERM_STR(KS_CEI))	/* end insert mode */
+#define T_CSR	(TERM_STR(KS_CSR))	/* start replace mode */
+#define T_CRV	(TERM_STR(KS_CRV))	/* request version string */
+#define T_RBG	(TERM_STR(KS_RBG))	/* request background RGB */
+#define T_OP	(TERM_STR(KS_OP))	/* original color pair */
+#define T_U7	(TERM_STR(KS_U7))	/* request cursor position */
+#define T_8F	(TERM_STR(KS_8F))	/* set foreground color (RGB) */
+#define T_8B	(TERM_STR(KS_8B))	/* set background color (RGB) */
+#define T_BE	(TERM_STR(KS_CBE))	/* enable bracketed paste mode */
+#define T_BD	(TERM_STR(KS_CBD))	/* disable bracketed paste mode */
+#define T_PS	(TERM_STR(KS_CPS))	/* start of bracketed paste */
+#define T_PE	(TERM_STR(KS_CPE))	/* end of bracketed paste */
 
 #define TMODE_COOK  0	/* terminal mode for external cmds and Ex mode */
 #define TMODE_SLEEP 1	/* terminal mode for sleeping (cooked but no echo) */