Index: doc/LaTeXmacros/lstlang.sty
===================================================================
--- doc/LaTeXmacros/lstlang.sty	(revision 55f5c5905966140f92a5b88e60c2d85001884b25)
+++ doc/LaTeXmacros/lstlang.sty	(revision d6fb3c7e3fd2b09068679e165b082afc47930b28)
@@ -114,6 +114,6 @@
 		__typeof__, zero_t},
 	morekeywords=[2]{
-		accept, _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, 
-		resume, signal, signal_block, suspend, thread, _Thread_local, wait, yield},
+		_Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, 
+		resume, suspend, thread, _Thread_local, yield},
 }
 
Index: doc/proposals/concurrency/style/cfa-format.tex
===================================================================
--- doc/proposals/concurrency/style/cfa-format.tex	(revision 55f5c5905966140f92a5b88e60c2d85001884b25)
+++ doc/proposals/concurrency/style/cfa-format.tex	(revision d6fb3c7e3fd2b09068679e165b082afc47930b28)
@@ -145,4 +145,28 @@
 }
 
+\lstdefinestyle{cfaStyle}{
+  escapeinside={@@},
+  basicstyle=\linespread{0.9}\tt\footnotesize,		% reduce line spacing and use typewriter font
+  keywordstyle=\bfseries\color{blue},
+  keywordstyle=[2]\bfseries\color{Plum},
+  commentstyle=\itshape\color{OliveGreen},		    % green and italic comments
+  identifierstyle=\color{identifierCol},
+  stringstyle=\sf\color{Mahogany},			          % use sanserif font
+  mathescape=true,
+  columns=fixed,
+  aboveskip=4pt,                                  % spacing above/below code block
+  belowskip=3pt,
+  keepspaces=true,
+  % frame=lines,
+  literate=,
+  showlines=true,                                 % show blank lines at end of code
+  showspaces=false,
+  showstringspaces=false,
+  escapechar=\$,
+  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
+  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
+  morekeywords=[2]{accept, signal, signal_block, wait},
+}
+
 \lstMakeShortInline[basewidth=0.5em,breaklines=true,basicstyle=\normalsize\ttfamily\color{basicCol}]@  % single-character for \lstinline
 
@@ -158,5 +182,5 @@
   \lstset{
     language = CFA,
-    style=defaultStyle,
+    style=cfaStyle,
     #1
   }
@@ -230,4 +254,4 @@
 \newcommand{\one}{\lstinline{one_t}\xspace}
 \newcommand{\ateq}{\lstinline{\@=}\xspace}
-\newcommand{\code}[1]{\lstinline[language=CFA,style=defaultStyle]{#1}}
+\newcommand{\code}[1]{\lstinline[language=CFA,style=cfaStyle]{#1}}
 \newcommand{\pscode}[1]{\lstinline[language=pseudo,style=pseudoStyle]{#1}}
Index: doc/user/user.tex
===================================================================
--- doc/user/user.tex	(revision 55f5c5905966140f92a5b88e60c2d85001884b25)
+++ doc/user/user.tex	(revision d6fb3c7e3fd2b09068679e165b082afc47930b28)
@@ -11,6 +11,6 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Tue May 30 11:42:47 2017
-%% Update Count     : 2097
+%% Last Modified On : Tue May 30 11:45:46 2017
+%% Update Count     : 2098
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -5164,5 +5164,5 @@
 \Celeven prescribes the following standard header-files~\cite[\S~7.1.2]{C11} and \CFA adds to this list:
 \begin{quote2}
-\lstset{deletekeywords={float},deletekeywords=[2]{signal}}
+\lstset{deletekeywords={float}}
 \begin{tabular}{@{}llll|l@{}}
 \multicolumn{4}{c|}{C11} & \multicolumn{1}{c}{\CFA}		\\