Index: doc/proposals/concurrency/style/cfa-format.tex
===================================================================
--- doc/proposals/concurrency/style/cfa-format.tex	(revision db0fa7c2f36d09a3445ac0aca454b055cf4b602a)
+++ doc/proposals/concurrency/style/cfa-format.tex	(revision 27dde7273db1fc3e8ccc5b86ab933cb0ffd57c37)
@@ -1,3 +1,3 @@
-\usepackage{xcolor}
+\usepackage[usenames,dvipsnames]{xcolor}
 \usepackage{listings}
 \usepackage{inconsolata}
@@ -144,18 +144,21 @@
   % moredelim=** allows cumulative application
 }
-\lstset{
-  morekeywords=[2]{nomutex,mutex,thread,wait,wait_release,signal,signal_block,accept,monitor,suspend,resume,coroutine}
-  language = CFA,
-  style=defaultStyle
-}
+
 \lstMakeShortInline[basewidth=0.5em,breaklines=true,basicstyle=\normalsize\ttfamily\color{basicCol}]@  % single-character for \lstinline
 
-\lstnewenvironment{cfacode}[1][]{ %
-  \lstset{ %
-    language = CFA, %
-    style=defaultStyle, %
-    morekeywords=[2]{nomutex,mutex,thread,wait,signal,signal_block,accept,monitor,suspend,resume,coroutine}, %
-    #1 %
-  } %
+\lstnewenvironment{ccode}[1][]{
+  \lstset{
+    language = C,
+    style=defaultStyle,
+    #1
+  }
+}{}
+
+\lstnewenvironment{cfacode}[1][]{
+  \lstset{
+    language = CFA,
+    style=defaultStyle,
+    #1
+  }
 }{}
 
@@ -169,4 +172,12 @@
 
 \lstnewenvironment{cppcode}[1][]{
+  \lstset{
+    language = c++,
+    style=defaultStyle,
+    #1
+  }
+}{}
+
+\lstnewenvironment{ucppcode}[1][]{
   \lstset{
     language = c++,
@@ -219,2 +230,4 @@
 \newcommand{\one}{\lstinline{one_t}\xspace}
 \newcommand{\ateq}{\lstinline{\@=}\xspace}
+\newcommand{\code}[1]{\lstinline[language=CFA,style=defaultStyle]{#1}}
+\newcommand{\pscode}[1]{\lstinline[language=pseudo,style=pseudoStyle]{#1}}
Index: doc/proposals/concurrency/style/style.tex
===================================================================
--- doc/proposals/concurrency/style/style.tex	(revision db0fa7c2f36d09a3445ac0aca454b055cf4b602a)
+++ doc/proposals/concurrency/style/style.tex	(revision 27dde7273db1fc3e8ccc5b86ab933cb0ffd57c37)
@@ -4,9 +4,9 @@
 % \CFADefaultStyle
 
-\lstset{
-morekeywords=[2]{nomutex,mutex,thread,wait,wait_release,signal,signal_block,accept,monitor,suspend,resume,coroutine},
-keywordstyle=[2]\color{blue},				% second set of keywords for concurency
-basicstyle=\linespread{0.9}\tt\small,		% reduce line spacing and use typewriter font
-stringstyle=\sf\color{Mahogany},			% use sanserif font
-commentstyle=\itshape\color{OliveGreen},		% green and italic comments
-}%
+% \lstset{
+% morekeywords=[2]{nomutex,mutex,thread,wait,wait_release,signal,signal_block,accept,monitor,suspend,resume,coroutine},
+% keywordstyle=[2]\color{blue},				% second set of keywords for concurency
+% basicstyle=\linespread{0.9}\tt\small,		% reduce line spacing and use typewriter font
+% stringstyle=\sf\color{Mahogany},			% use sanserif font
+% commentstyle=\itshape\color{OliveGreen},		% green and italic comments
+% }%