tikzpeople (28nov16)

git-svn-id: svn://tug.org/texlive/trunk@42598 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2016-11-28 23:47:56 +0000
committer: Karl Berry <karl@freefriends.org> 2016-11-28 23:47:56 +0000
commit: 3bb968911fe7c1366654b04283a2b0c90968f212 (patch)
tree: 07a7bcdabc295e16cdf5c0782c4cf7187f134e0c /Master/texmf-dist
parent: 17096b7bd77fd18fc0e73e628b1ce5ab1dddca60 (diff)
33 files changed, 1288 insertions, 1045 deletions
diff --git a/Master/texmf-dist/doc/latex/tikzpeople/README.md b/Master/texmf-dist/doc/latex/tikzpeople/README.md
index aff8e5cd50e..ec927b9ca6d 100644
--- a/Master/texmf-dist/doc/latex/tikzpeople/README.md
+++ b/Master/texmf-dist/doc/latex/tikzpeople/README.md
@@ -1,24 +1,27 @@
 The tikzpeople package provides people shaped nodes to be used in tikz.
 The available node shapes are:
 
-	alice, bob, bride, builder, businessman, charlie, chef, conductor, cowboy, 
-	criminal, dave, graduate, groom, guard, jester, judge, mexican, nun, nurse, 
-	physician, pilot, police, priest, sailor, santa, surgeon
+alice, bob, bride, builder, businessman, charlie, chef, conductor, cowboy, 
+criminal, dave, devil, duck, graduate, groom, guard, jester, judge, maninblack, 
+mexican, nun, nurse, physician, pilot, police, priest, sailor, santa, surgeon
 
-The package has three options:
-	- The "draft" option causes all tikzpeople to be rendered as a basic outline 
+The package has four options:
+- The "draft" option causes all tikzpeople to be rendered as a basic outline 
 		of a person.
-	- The "demo" option adds two commands. 
-		The command \alltikzpeople{<width>}{<options>} produces a series of figures 
-		of all available shapes with the given width and the provided options 
-		applied. The command \tikzpeoplecolors{<shapename>} produces a figure 
-		showing the available color keys for the shape.
-	- The "nonbeards" option removes all beards.
+- The "demo" option adds two commands. 
+	The command \alltikzpeople{<width>}{<options>} produces a series of figures 
+	of all available shapes with the given width and the provided options 
+	applied. The command \tikzpeoplecolors{<shapename>} produces a figure 
+	showing the available color keys for the shape.
+- The "nonbeards" option removes all beards.
+- The "saturated" option causes the tikzpeople to be drawn with saturated colors.
 	
 The nodes have the following hopefully self explanatory options:
-	evil, good, female, mirrored, monitor
+
+evil, good, female, mirrored, monitor, saturated, shield, sword
+
 All options can be combined freely.
 
 The tikzpeople package is licensed under the LaTeX Project Public License
 
- -- Nils Fleischhacker <mail@nilsfleischhacker.de>  08 Nov 2016
+ -- Nils Fleischhacker <mail@nilsfleischhacker.de>  28 Nov 2016
diff --git a/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.pdf b/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.pdf
index 5f3ca3d216b..6f75824716f 100644
--- a/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.pdf
+++ b/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.pdf
diff --git a/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.tex b/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.tex
index 9f9ab712bff..8746c33588c 100644
--- a/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.tex
+++ b/Master/texmf-dist/doc/latex/tikzpeople/tikzpeople.tex
@@ -82,7 +82,7 @@
   lefthand width=#2,tikz lower,fillbackground,
   #1}
 
-\title{The \textsf{tikzpeople} package}
+\title{\tikz{\node[graduate,shield,sword,minimum height=2cm]{}}\\The \textsf{tikzpeople} package}
 \author{Nils Fleischhacker}
 \date{}
 
@@ -98,7 +98,7 @@
 \end{abstract}
 
 \section{Introduction}
-	Let me start with a word of warning:
+	Let me start with a word of warning: 
 	The node-shapes defined by this package are heavily influenced by a type of clip art included in the \textsf{Microsoft Visio} software.
 	I am by no means an expert on copyright law and as such can make no claim under which circumstances using these shapes might infringe on Microsoft's copyright.
 	I do not expect that there are any problems, but be aware of this.
@@ -175,6 +175,12 @@
 	In particular, \textsf{tikzpeople} marked as evil no longer have goatees.
 	This option exists because I have been informed that having evil \textsf{tikzpeople} with goatees is very insensitive and discriminatory against people with goatees.
 	For a little bit of petty defiance, this option also removes Santa's beard.
+
+	\DescribeOption{saturated}
+	The \textsf{saturated} option causes all nodes to be rendered with saturated colors.
+	Standard nodes are rendered with somewhat washed out colors.
+	This works well on light backgrounds but can look weird on dark background.
+	The |saturated| option can also be used on individual nodes.
 	
 \subsection{Available Shapes}
 	Once the package is loaded, any of the defined shapes can be used as the shape of any \tikzname node just like any other predefined shape.
@@ -226,7 +232,8 @@
 \node[priest,evil,minimum size=1cm] {};
 	\end{codeexample}
 	This is especially useful to depict attackers in a cryptographic or security setting.
-	Unaffected by this option are: \texttt{guard,santa}.
+	Unaffected by this option are: \texttt{guard,santa,devil}.
+	The color of the horns is controlled with the |horns| key.
 
 	\DescribeOption{female}	The |female| option is supposed to make stereotypically male nodes look just a tad more feminine.
 		For most tikzpeople this is accomplished by adding longer hair and losing the beard -- though surprisingly, evil women still tend to have a goatee.
@@ -246,6 +253,7 @@
 		\end{codeexample}
 		This could be useful to, e.g., depict a trusted party in a security context.
 		Unaffected by this option are: \texttt{guard, mexican, santa}.
+		The color of the halo is controlled with the |halo| key.
 		
 	\DescribeOption{mirrored}	The \textsf{mirrored} option makes nodes face to the left instead of the right.
 		\begin{codeexample}{3.2cm}
@@ -260,11 +268,36 @@
 \node[judge,monitor,minimum size=1cm]{};
 		\end{codeexample}
 		This could be useful to emphasize that parties are actually using a computer and not doing complex computations in their head.
+	
+	\DescribeOption{saturated} The \textsf{saturated} option causes the node to be rendered with saturated colors.
+		\begin{codeexample}{3.2cm}
+\node[pilot,minimum size=1cm,xshift=-1.2cm]{};
+\node[pilot,saturated,minimum size=1cm]{};
+		\end{codeexample}
+		Standard nodes are rendered with somewhat washed out colors.
+		This works well on light backgrounds but can look weird on dark background.
+		The |saturated| option can also be used as a global package option.
+
+	\DescribeOption{shield} The \textsf{shield} option gives the node a shield.
+		\begin{codeexample}{4cm}
+\node[alice,minimum size=1cm,xshift=-1.2cm]{};
+\node[alice,shield,minimum size=1cm]{};
+		\end{codeexample}
+		This could be useful to symbolize that a party is defending something and combines well with the |sword| option.
+		The colors of the shield are controlled using the keys |shieldmid|, |shieldedge|, and |shieldrivets|.
+	
+	\DescribeOption{sword} The \textsf{sword} option gives the node a sword.
+		\begin{codeexample}{4cm}
+\node[dave,minimum size=1cm,xshift=-1.2cm]{};
+\node[dave,sword,minimum size=1cm]{};
+		\end{codeexample}
+		This could be useful to symbolize that a party is attacking or defending something and combines well with the |shield| option.
+		The colors of the sword are controlled using the keys |swordblade|, |swordguard|, |swordpommel|, and |swordgrip|.
 
 	All of these options can be arbitrarily combined. So, e.g., |good| \textsf{tikzpeople} can very well be |evil| at the same time.
 	\begin{codeexample}{4cm}
 \node[chef,evil,female,good,mirrored,monitor,
-	minimum size=1.5cm]{};
+  saturated,shield,sword,minimum size=1.5cm]{};
 	\end{codeexample}
 \subsection{Color Options}
 	Almost all the colors used in the \textsf{tikzpeople} shapes can be specified separately.
@@ -280,19 +313,24 @@
 	
 	\DescribeMacro{\tikzpeoplecolors} If the package is loaded with the |demo| option, you can use the command |\tikzpeoplecolors|\marg{shapename} to produce a figure giving you an idea, which color keys can be used for which shape.
 	For your convenience, all of those figures are included in \autoref{app:colors}.
-	\subsubsection{Known Problems}
-		There is some weird behaviour if you try to mix colors when setting color options.
-		Say we want a policeman with a light purple jacket\footnote{Wouldn't those guys seem much more approachable and friendly? Just think about it.} and we mix purple from 25\% blue and 50\% red by setting |shirt=red!50!blue!50|.
-		Here we get some cryptic error messages, that seem to have to do with the fact that the colors are once again mixed for the style of the jacket to produce a nice shading.
-		I'm unsure why it fails.
-		If we set |shirt=red!50!blue!100| to get a deep purple, we do not get an error, but there is no shading.
-		Whatever the cause, in both cases we get the expected result by adding an additional exclamation mark to the end, though I'm not sure why.
-		\begin{codeexample}{3cm}
-\node[police,shirt=red!50!blue!50!, hat=red!50!blue!50!, minimum size=1.5cm]{};
-		\end{codeexample}
-		\begin{codeexample}{3cm}
-\node[police,shirt=red!50!blue!100!, hat=red!50!blue!100!, minimum size=1.5cm]{};
-		\end{codeexample}
+	
+	\subsection{Text Options}
+	Some \textsf{tikzpeople} have include customizable text, such as the |businessman|'s monogram.
+	These texts can be specified with pgfkeys just as with the color options.
+	\vspace{.75em}
+	\begin{codeexample}{3cm}
+\path [clip] (0cm,1cm) rectangle (1.5cm,-1cm);
+\node[businessman, monogramtext=ER ,minimum size=5cm]{};
+	\end{codeexample}
+	
+	\vspace{1em}
+	
+	All texts are scaled to fit the available space. Specifying significantly longer text will therefore cause it to be unreadable.
+	
+	\DescribeOption{monogramtext} The |monogramtext| option is available for |businessman| shapes and changes the text of the monogram.
+	While you can change the monogram to any arbitrary text, you should be aware that the monogram is rendered as |\mathcal| and anything except for uppercase letters will probably lead to unexpected results.
+	
+	\DescribeOption{badgetext} The |badgetext| option is available for |nurse| shapes and changes the text printed on the badge.
 	
 \subsection{Anchors}
 		\tikzset{shape example/.style={color=black!30, draw, fill=yellow!30, minimum size=3cm}}
@@ -352,6 +390,7 @@ Namely into ``Dimension to large'' errors in the |\pgfmath@function@veclen| comm
 Apparently this happens because we are working with numbers that are too small.
 As per this \TeX-stackexchange answer \url{http://tex.stackexchange.com/a/20888/15636}, \textsf{tikzpeople} redeclares |\pgfmath@function@veclen| with a fixed version.
 
+
 \clearpage
 \begin{appendices}
 	\section{Color Options}
@@ -367,11 +406,14 @@ As per this \TeX-stackexchange answer \url{http://tex.stackexchange.com/a/20888/
 		\vfill\tikzpeoplecolors{cowboy}
 		\vfill\tikzpeoplecolors{criminal}
 		\vfill\tikzpeoplecolors{dave}
+		\vfill\tikzpeoplecolors{devil}
+		\vfill\tikzpeoplecolors{duck}
 		\vfill\tikzpeoplecolors{graduate}
 		\vfill\tikzpeoplecolors{groom}
 		\vfill\tikzpeoplecolors{guard}
 		\vfill\tikzpeoplecolors{jester}
 		\vfill\tikzpeoplecolors{judge}
+		\vfill\tikzpeoplecolors{maninblack}
 		\vfill\tikzpeoplecolors{mexican}
 		\vfill\tikzpeoplecolors{nun}
 		\vfill\tikzpeoplecolors{nurse}
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.alice.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.alice.sty
index ab0243e5fbf..a2aff754710 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.alice.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.alice.sty
@@ -13,24 +13,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
-\tikzpeople@addcolorkey{hat}
-\tikzpeople@addcolorkey{undershirt}
 
 \newcommand{\tikzpeople@alice@paint}{
 	\tikzpeople@person@paintshirt
@@ -45,48 +28,46 @@
 
 \newcommand{\tikzpeople@alice@painthair}{
 	\draw[hair]
-(15:3pt) arc (15:160:3pt) arc (160:190:5pt) to[out=280,in=190,in looseness=.5,out looseness=.7] (230:2.9pt)
-  to[out=120,in=120,looseness=2] (-1.7pt,-1pt) to[out=60,in=170,out looseness=2,in looseness=.75] (-1pt,0.3pt) to [out=350,in=200,out looseness=1.5,in looseness=.75]
-(15:3pt) -- cycle;
+		(15:3pt) arc (15:160:3pt) arc (160:190:5pt) 
+		to[out=280,in=190,in looseness=.5,out looseness=.7] (230:2.9pt)
+  	to[out=120,in=120,looseness=2] (-1.7pt,-1pt) 
+  	to[out=60,in=170,out looseness=2,in looseness=.75] (-1pt,0.3pt) 
+  	to [out=350,in=200,out looseness=1.5,in looseness=.75] (15:3pt) -- cycle;
 }
 
 \newcommand{\tikzpeople@alice@paintshirtdetails}{
 	\begin{scope}
-\clip 
-	(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. 
-	( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt,0pt) ..
-	(-4pt,-8pt);
-\draw[shirt,shading angle=-45] (2pt,-8.7pt) -- ++(-3.8pt,3.8pt) -- ++(2.5pt,1.5pt)--cycle;
-\draw[shirt,shading angle=-45] (2pt,-8.7pt) -- ++(1.2pt,4.7pt) -- ++(-2.4pt,.3pt)--cycle;
+		\clip 
+			(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. 
+			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt,0pt) ..
+			(-4pt,-8pt);
+		\draw[shirt,shading angle=-45] 
+			(2pt,-8.7pt) -- ++(-3.8pt,3.8pt) -- ++(2.5pt,1.5pt)--cycle;
+		\draw[shirt,shading angle=-45] 
+			(2pt,-8.7pt) -- ++(1.2pt,4.7pt) -- ++(-2.4pt,.3pt)--cycle;
 	\end{scope}
-\fill[color=\tikzpeople@shirt!40!black]
-	(230:3pt) ++(0pt,-2pt) to[out=359,in=101, in looseness=1.5, out looseness=1.1]	++(3.8pt,-4pt) -- ++(-.8pt,4pt);
-\draw[undershirt]
-	(230:3pt) to[out=230,in=100] ++(0pt,-2pt) to[out=0,in=110]	++(3.4pt,-2pt) to[out=70,in=190]
-	++(1.7pt,2.7pt) to[out=100,in=340]
-	(310:3pt);
-\draw[skin]
-	(250:3pt) to[out=330,in=110] (1.4pt,-5.7pt) to[out=80,in=269, out looseness=1.5] (305:3pt) ;
+	\fill[color=\tikzpeople@shirt!40!black]
+		(230:3pt) ++(0pt,-2pt) 
+		to[out=359,in=101, in looseness=1.5, out looseness=1.1]	++(3.8pt,-4pt) -- 
+		++(-.8pt,4pt);
+	\draw[undershirt]
+		(230:3pt) to[out=230,in=100] ++(0pt,-2pt) to[out=0,in=110]	++(3.4pt,-2pt) 
+		to[out=70,in=190] ++(1.7pt,2.7pt) to[out=100,in=340] (310:3pt);
+	\draw[skin]
+		(250:3pt) to[out=330,in=110] (1.4pt,-5.7pt) 
+		to[out=80,in=269, out looseness=1.5] (305:3pt);
 }
 
 \newcommand{\tikzpeople@alice@definecolors}{
 	\definecolor{shirt}{RGB}{253,156,40}
 	\definecolor{undershirt}{RGB}{232,232,232}
-	\definecolor{hat}{RGB}{232,232,232}
 	\definecolor{skin}{RGB}{148,60,19}
 	\definecolor{hair}{rgb}{0,0,0}
 }
 \newcommand{\tikzpeople@alice@definestyles}{
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45]
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!30, bottom color=\tikzpeople@shirt!90,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!30, bottom color=\tikzpeople@hat!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
 }
 
 \newcommand{\tikzpeople@alice@colors}{
-	shirt/340/{1/-.75},	hair/160/{-.65/1}, skin/20/{.25/.6}, details/200/{-.45/-.2}%
+	shirt/340/{1/-.75},	hair/160/{-.65/1}, skin/20/{.25/.6}, 
+	details/200/{-.45/-.2}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bob.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bob.sty
index 6adc0cd1bec..e68e8016ce1 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bob.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bob.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
 \tikzpeople@addcolorkey{pearls}
 
 \newcommand{\tikzpeople@bob@paint}{
@@ -43,22 +27,21 @@
 }
 
 \newcommand{\tikzpeople@bob@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{shirt}{RGB}{98,98,98}
 	\definecolor{pearls}{RGB}{252,137,172}
 	\definecolor{undershirt}{rgb}{0.9,0.9,0.9}
 }
 
 \newcommand{\tikzpeople@bob@definestyles}{
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45]
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45]
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45]
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=90]
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45]
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45]
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45]
-	\tikzstyle{pearls}=[top color=\tikzpeople@pearls!40,bottom color=\tikzpeople@pearls!80,shading angle=-45]
+	\if@tikzpeople@saturated
+		\tikzset{
+			pearls/.style={top color=\tikzpeople@pearls!70,bottom color=\tikzpeople@pearls,shading angle=-45}
+		}
+	\else
+		\tikzset{
+			pearls/.style={top color=\tikzpeople@pearls!40,bottom color=\tikzpeople@pearls!80,shading angle=-45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@bob@painthair}{
@@ -91,7 +74,7 @@
 			(2pt,-7.8pt)  to[out=80,in=280,looseness=.75] (1.9pt,-1pt);
 		\draw[skin]
 			(245:2.9pt) to[out=300,in=270,looseness=1.5] (311:3pt) -- cycle;
-		\draw[color=\tikzpeople@shirt!80]
+		\draw[color=\tikzpeople@shirt\if@tikzpeople@saturated\else!80\fi]
 			(-1.9pt,-1pt) to[out=290,in=130,looseness=.75] 
 			(2pt,-7.8pt)  to[out=80,in=280,looseness=.75] (1.9pt,-1pt);
 		\if@tikzpeople@female
@@ -104,5 +87,6 @@
 }
 
 \newcommand{\tikzpeople@bob@colors}{
-	shirt/200/{-1/-.6},	hair/160/{-.65/1}, skin/20/{.25/.4}, undershirt/340/{.15/-.4}%
+	shirt/200/{-1/-.6},	hair/160/{-.65/1}, skin/20/{.25/.4}, 
+	undershirt/340/{.15/-.4}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bride.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bride.sty
index 6f2b6ccffae..9aa1e21d4fb 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bride.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.bride.sty
@@ -13,23 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{pearls}
 \tikzpeople@addcolorkey{veil}
 
@@ -75,25 +58,35 @@
 
 \newcommand{\tikzpeople@bride@paintveilleft}{
 	\begin{scope}
-		\fill[veil] (-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc (40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
+		\fill[veil] 
+			(-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc 
+			(40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
 		\pgftransformshift{\pgfpoint{-.5pt}{-.4pt}}
 		\pgftransformrotate{-17}
-		\fill[veil] (-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc (40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
+		\fill[veil] 
+			(-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc 
+			(40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
 		\pgftransformshift{\pgfpoint{-.5pt}{-.4pt}}
 		\pgftransformrotate{-17}
-		\fill[veil] (-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc (40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
+		\fill[veil] 
+			(-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc 
+			(40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
 		\pgftransformshift{\pgfpoint{-.5pt}{-.4pt}}
 		\pgftransformrotate{-17}
-		\fill[veil] (-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc (40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
+		\fill[veil] 
+			(-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc 
+			(40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
 		\pgftransformshift{\pgfpoint{-.5pt}{-.4pt}}
 		\pgftransformrotate{-17}
-		\fill[veil] (-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc (40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
+		\fill[veil] 
+			(-1.3pt,.6pt) -- ++(.5pt,-2.5pt) arc (80:140:.7pt) arc (60:120:.7pt) arc 
+			(40:100:.7pt) -- ++(.5pt,2.5pt) --cycle;
 	\end{scope}
 	\path[postaction={decorate},decoration={markings,
 		mark=between positions 0.1 and 1 step 0.27 with {\pgftransformscale{\scalingfactor}
 			\fill[pearls] 
-				(0,.3pt) circle (.2pt) ++(216:.5pt) circle (.2pt) ++(288:.5pt) circle (.2pt)
-				++(0:.5pt) circle (.2pt) ++(72:.5pt) circle (.2pt);
+				(0,.3pt) circle (.2pt) ++(216:.5pt) circle (.2pt) ++(288:.5pt) circle 
+				(.2pt) ++(0:.5pt) circle (.2pt) ++(72:.5pt) circle (.2pt);
 		}}]
 		(150:3.3pt) to [out=330,in=210] (35:3pt);
 }
@@ -101,26 +94,24 @@
 \newcommand{\tikzpeople@bride@definecolors}{
 	\definecolor{shirt}{RGB}{236,240,255}
 	\definecolor{pearls}{rgb}{.96,.96,1}
-	\definecolor{hat}{rgb}{0,0,0}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{undershirt}{rgb}{.8,.8,.8}
 	\definecolor{veil}{RGB}{179,196,228}
 }
 \newcommand{\tikzpeople@bride@definestyles}{
-	\tikzstyle{veil}=[color=\tikzpeople@veil!50!white,opacity=0.3];
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!50, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{tie}=[color=\tikzpeople@tie!80,inner color=\tikzpeople@tie!60, outer color=\tikzpeople@tie!80];
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
-	\tikzstyle{pearls}=[top color=\tikzpeople@pearls!40,bottom color=\tikzpeople@pearls!80,shading angle=-45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			veil/.style  ={color=\tikzpeople@veil!80!white,opacity=0.3},
+			pearls/.style={top color=\tikzpeople@pearls!70,bottom color=\tikzpeople@pearls,shading angle=-45}
+		}
+	\else
+		\tikzset{
+			veil/.style  ={color=\tikzpeople@veil!50!white,opacity=0.3},
+			pearls/.style={top color=\tikzpeople@pearls!40,bottom color=\tikzpeople@pearls!80,shading angle=-45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@bride@colors}{
-	shirt/200/{-1/-.75},	veil/170/{-1.2/.8}, hair/150/{-.4/1.6}, skin/30/{.6/.8}, pearls/340/{.025/1.05,.5/-.4}%
+	shirt/200/{-1/-.75},	veil/170/{-1.2/.8}, hair/150/{-.4/1.6}, skin/30/{.6/.8}, 
+	pearls/340/{0/.97,.47/-.46}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.builder.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.builder.sty
index eb3512e28cd..8ff6d9e789f 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.builder.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.builder.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{trousers}
 
 \newcommand{\tikzpeople@builder@paint}{
@@ -63,7 +47,9 @@
 }
 
 \newcommand{\tikzpeople@builder@painthat}{
-	\draw[hat] (160:3.5pt) to[out=320,in=170] (0,0) -- ++(1pt,-.5pt) arc(270:310:5pt) -- ++(-.9pt,.5pt) .. controls +(95:3pt) and +(80:4pt) .. (160:3.5pt);
+	\draw[hat] 
+		(160:3.5pt) to[out=320,in=170] (0,0) -- ++(1pt,-.5pt) arc(270:310:5pt) -- 
+		++(-.9pt,.5pt) .. controls +(95:3pt) and +(80:4pt) .. (160:3.5pt);
 	\draw[color=\tikzpeople@hat] (0,0) arc(270:305:6pt);
 	\draw[color=\tikzpeople@hat] (1.2pt,0.2pt) arc (0:70:2.8pt) -- ++(160:1.2pt);
 	\draw[color=\tikzpeople@hat] (2.2pt,0.5pt) arc (0:70:2.8pt) -- ++(159:1.5pt);
@@ -71,23 +57,24 @@
 }
 
 \newcommand{\tikzpeople@builder@definecolors}{
-	\definecolor{shirt}{rgb}{1,1,1}
+	\definecolor{shirt}{RGB}{232,232,232}
 	\definecolor{hat}{RGB}{238,175,0}
 	\definecolor{trousers}{RGB}{33,81,171}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
   \definecolor{hair}{rgb}{0,0,0}
 }
 \newcommand{\tikzpeople@builder@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!60!black!20,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!60!black!30,shading angle=45];
-	\tikzstyle{trousers}=[color=\tikzpeople@trousers!100,top color=\tikzpeople@trousers!60, bottom color=\tikzpeople@trousers!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,inner color=\tikzpeople@hat!40, outer color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45]
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45]
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45]
+	\if@tikzpeople@saturated
+		\tikzset{
+			trousers/.style={color=\tikzpeople@trousers,top color=\tikzpeople@trousers!70, bottom color=\tikzpeople@trousers,shading angle=45}
+		}
+	\else
+		\tikzset{
+			trousers/.style={color=\tikzpeople@trousers!80,top color=\tikzpeople@trousers!60, bottom color=\tikzpeople@trousers!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@builder@colors}{
-	trousers/200/{-.8/-.95}, hat/160/{-.35/1.4}, skin/20/{.5/.6}, hair/180/{-.7/.8}, shirt/340/{.3/-.3}%
+	trousers/200/{-.8/-.95}, hat/160/{-.35/1.4}, skin/20/{.5/.6}, 
+	hair/180/{-.7/.8}, shirt/340/{.3/-.3}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.businessman.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.businessman.sty
index 26eff1d3e0d..33e61374ad3 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.businessman.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.businessman.sty
@@ -13,24 +13,9 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
 \tikzpeople@addcolorkey{tie}
 \tikzpeople@addcolorkey{monogram}
+\tikzpeople@addtextkey{monogramtext}{BP}
 
 \newcommand{\tikzpeople@businessman@paint}{
 	\tikzpeople@person@paintshirt
@@ -45,8 +30,6 @@
 }
 
 \newcommand{\tikzpeople@businessman@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{shirt}{rgb}{0.12,0.39,0.14}
 	\definecolor{undershirt}{rgb}{0.9,0.9,0.9}
 	\definecolor{tie}{rgb}{0.5,0.1,0.1}
@@ -54,14 +37,15 @@
 }
 
 \newcommand{\tikzpeople@businessman@definestyles}{
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45]
-	\tikzstyle{tie}=[color=\tikzpeople@tie!80,top color=\tikzpeople@tie!40, bottom color=\tikzpeople@tie!80,shading angle=45]
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45]
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45]
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45]
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45]
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45]
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45]
+	\if@tikzpeople@saturated
+		\tikzset{
+			tie/.style={color=\tikzpeople@tie,top color=\tikzpeople@tie!70, bottom color=\tikzpeople@tie,shading angle=45}
+		}
+	\else
+		\tikzset{
+			tie/.style={color=\tikzpeople@tie!80,top color=\tikzpeople@tie!40, bottom color=\tikzpeople@tie!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@businessman@paintundershirt}{
@@ -86,9 +70,9 @@
 			\pgf@xa=0.5pt*\scalingfactor
 			\if@tikzpeople@mirrored
 				\pgftransformxscale{-1}
-				\pgftext[at=\pgfpoint{1pt}{-4pt}]{\resizebox{\pgf@xa}{!}{\color{\tikzpeople@monogram}{$\mathcal{BP}$}}}
+				\pgftext[at=\pgfpoint{1pt}{-4pt}]{\resizebox{\pgf@xa}{!}{\color{\tikzpeople@monogram}{$\mathcal{\tikzpeople@monogramtext}$}}}
 			\else
-				\pgftext[at=\pgfpoint{0.3pt}{-4pt}]{\resizebox{\pgf@xa}{!}{\color{\tikzpeople@monogram}{$\mathcal{BP}$}}}
+				\pgftext[at=\pgfpoint{0.3pt}{-4pt}]{\resizebox{\pgf@xa}{!}{\color{\tikzpeople@monogram}{$\mathcal{\tikzpeople@monogramtext}$}}}
 			\fi
 		}
 }
@@ -115,5 +99,6 @@
 }
 
 \newcommand{\tikzpeople@businessman@colors}{
-	shirt/200/{-1/-.75},	hair/150/{-.4/1.3}, skin/30/{.5/.8}, undershirt/180/{.1/-.2}, tie/330/{.32/-.7}, monogram/0/{.4/-.1}%
+	shirt/200/{-1/-.75},	hair/150/{-.4/1.3}, skin/30/{.5/.8}, 
+	undershirt/180/{0/-.2}, tie/330/{.32/-.7}, monogram/0/{.3/-.17}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.charlie.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.charlie.sty
index e1e1feca5c4..b03281da104 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.charlie.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.charlie.sty
@@ -13,21 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{buttons}
 
 \newcommand{\tikzpeople@charlie@paint}{
@@ -42,21 +27,23 @@
 }
 
 \newcommand{\tikzpeople@charlie@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{RGB}{107, 68, 35}
+	\definecolor{hair}{RGB}{107,68,35}
 	\definecolor{shirt}{RGB}{0,100,105}
 	\definecolor{buttons}{RGB}{128,70,27}
 }
 
 \newcommand{\tikzpeople@charlie@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45]
-	\tikzstyle{collar}=[color=\tikzpeople@shirt!30,inner color=\tikzpeople@shirt!10, outer color=\tikzpeople@shirt!30]
-	\tikzstyle{buttons}=[color=\tikzpeople@buttons!80,inner color=\tikzpeople@buttons!60, outer color=\tikzpeople@buttons!80]
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45]
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=90]
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45]
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45]
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45]
+	\if@tikzpeople@saturated
+		\tikzset{
+			collar/.style ={color=\tikzpeople@shirt!70,inner color=\tikzpeople@shirt!50, outer color=\tikzpeople@shirt!50},
+			buttons/.style={color=\tikzpeople@buttons,inner color=\tikzpeople@buttons!80, outer color=\tikzpeople@buttons}
+		}
+	\else
+		\tikzset{
+			collar/.style ={color=\tikzpeople@shirt!30,inner color=\tikzpeople@shirt!10, outer color=\tikzpeople@shirt!30},
+			buttons/.style={color=\tikzpeople@buttons!80,inner color=\tikzpeople@buttons!60, outer color=\tikzpeople@buttons!80}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@charlie@painthair}{
@@ -133,5 +120,6 @@
 }
 
 \newcommand{\tikzpeople@charlie@colors}{
-	shirt/200/{-1/-.75}, hair/160/{-.75/1}, skin/20/{.5/.8}, buttons /340/{.41/-.54}%
+	shirt/200/{-1/-.75}, hair/160/{-.75/1}, skin/20/{.5/.8}, 
+	buttons/340/{.39/-.59}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.chef.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.chef.sty
index fc51b15024a..ee4b5924078 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.chef.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.chef.sty
@@ -13,23 +13,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
-\tikzpeople@addcolorkey{hat}
 
 \newcommand{\tikzpeople@chef@paint}{
 	\tikzpeople@person@paintshirt
@@ -44,16 +28,13 @@
 }
 
 \newcommand{\tikzpeople@chef@paintshirtdetails}{
-	\begin{scope}
-		\draw[details] (230:3pt) .. controls (0.24pt,-5pt) and (0.29pt,-8pt) .. (0.3pt,-9pt);
+		\draw[details]
+			(230:3pt) .. controls (0.24pt,-5pt) and (0.29pt,-8pt) .. (0.3pt,-9pt);
 		\draw[shirt,thick,shading angle=-45]
-			(230:3pt) .. controls +(-0.4pt,-1.5pt) .. 
-			++(0pt,-3pt) .. controls +(1.5pt,0.5pt) ..
-			++(3pt,0.2pt) .. controls +(0.5pt,0.4pt) ..
-			++(2pt,0.7pt) .. controls +(0pt,0.5pt) ..
-			(312:3pt);
+			(230:3pt) .. controls +(-0.4pt,-1.5pt) .. ++(0pt,-3pt) .. controls 
+			+(1.5pt,0.5pt) .. ++(3pt,0.2pt) .. controls +(0.5pt,0.4pt) ..
+			++(2pt,0.7pt) .. controls +(0pt,0.5pt) .. (312:3pt);
 		\draw[skin] (231:3pt) -- (1pt,-4.85pt) -- (311:3pt) -- cycle;
-	\end{scope}
 }
 
 \newcommand{\tikzpeople@chef@painthat}{
@@ -73,21 +54,21 @@
 \newcommand{\tikzpeople@chef@definecolors}{
 	\definecolor{shirt}{RGB}{232,232,232}
 	\definecolor{hat}{RGB}{232,232,232}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{details}{rgb}{0.3,0.3,0.3}
 }
 \newcommand{\tikzpeople@chef@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!30, bottom color=\tikzpeople@shirt!90,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!30, bottom color=\tikzpeople@hat!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{details}=[color=\tikzpeople@details!80];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			details/.style={color=\tikzpeople@details}
+		}
+	\else
+		\tikzset{
+			details/.style={color=\tikzpeople@details!80}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@chef@colors}{
-	shirt/340/{.75/-.75},	hair/160/{-.75/.9}, hat/30/{.5/1.3}, skin/0/{.4/.6}, details/200/{-.04/-1}%
+	shirt/340/{.75/-.75},	hair/160/{-.75/.9}, hat/30/{.5/1.3}, skin/0/{.4/.6}, 
+	details/200/{-.1/-1}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.conductor.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.conductor.sty
index ec0954f23c9..f3d9e6d15c4 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.conductor.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.conductor.sty
@@ -13,23 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{hatshield}
 \tikzpeople@addcolorkey{hatbadge}
 \tikzpeople@addcolorkey{badge}
@@ -51,9 +34,9 @@
 	\draw[undershirt]
 		(-2.2pt,-1pt) -- (2pt,-8.5pt) -- (2pt,-1pt);
 	\draw[tie]
-		(0  pt,-2.5pt) -- (0.8pt,-3.2pt) -- (1.1pt,-6  pt) -- 
-		(1.7pt,-8.7pt) -- (1.9pt,-8.7pt) -- (2  pt,-5.5pt) --
-		(1  pt,-3.1pt) -- (1.2pt,-2  pt) -- (0.3pt,-2  pt);
+		(0  pt,-2.5pt) -- (0.8pt,-3.2pt) -- (1.1pt,-6  pt) -- (1.7pt,-8.7pt) -- 
+		(1.9pt,-8.7pt) -- (2  pt,-5.5pt) -- (1  pt,-3.1pt) -- (1.2pt,-2  pt) -- 
+		(0.3pt,-2  pt);
 	\draw[undershirt,shading angle=-45]
 		(0.5pt,-3pt) -- (0.1pt,-3.7pt) -- (-1pt,-3pt);
 	\draw[undershirt,shading angle=-45] 
@@ -63,37 +46,38 @@
 \newcommand{\tikzpeople@conductor@paintopenshirt}{
 	\begin{scope}
 		\clip 
-			(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. 
-			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt,0pt) ..
-			(-4pt,-8pt);
+			(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. ( 5pt,-7pt) .. 
+			controls ( 5pt,  0pt) and (-5pt,0pt) .. (-4pt,-8pt);
 		\draw[shirt,shading angle=-45]
 			(-2  pt,-2.6 pt) -- (-1.5pt,-5   pt) -- (-0.5pt,-5pt) -- 
-			(-1.1pt,-5.2 pt) -- ( 1.6pt,-8.75pt) -- 
-			( 1.9pt,-8.75pt) .. controls (1.7pt,-7pt) and (-0pt,-3.2pt) .. 
-			(-1.6pt,-2pt) -- cycle;
+			(-1.1pt,-5.2 pt) -- ( 1.6pt,-8.75pt) -- ( 1.9pt,-8.75pt) .. controls 
+			(1.7pt,-7pt) and (-0pt,-3.2pt) .. (-1.6pt,-2pt) -- cycle;
 		\draw[shirt,shading angle=-45]
 			(2pt,-2pt) .. controls (2.2pt,-1.8pt)	and (1.9pt,-8.5pt) .. 
 			(1.9pt,-8.75pt) -- (2.3pt,-8.5pt) -- (3.2pt,-5.2pt) -- (2.6pt,-5.2 pt) -- 
 			(3.2pt,-5  pt) -- (2.3pt,-2.3pt) -- cycle;
 	\end{scope}
-	\draw[color=\tikzpeople@shirt!80]
-(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
-( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) ..
-(-4pt,-8pt);
+	\draw[color=\tikzpeople@shirt\if@tikzpeople@saturated\else!80\fi]
+		(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. ( 5pt,-7pt) .. 
+		controls ( 5pt,  0pt) and (-5pt, 0pt) .. (-4pt,-8pt);
 }
 
 \newcommand{\tikzpeople@conductor@paintshirtdetails}{
 	\tikzpeople@conductor@paintundershirt
 	\tikzpeople@conductor@paintopenshirt
-	\draw[badge] (264:7pt) to[out=354 ,in=186] ++(0:0.5pt) -- ++(270:0.15pt) to[in=354 ,out=186] ++(180:0.5pt) -- (264:7pt);
-	\draw[badge] (261:7.5pt) to[out=354 ,in=186] ++(0:1.5pt) -- ++(270:0.25pt) to[in=354 ,out=186] ++(180:1.5pt) -- (261:7.5pt);
+	\draw[badge]
+		(264:7pt) to[out=354 ,in=186] ++(0:0.5pt) -- ++(270:0.15pt) 
+		to[in=354 ,out=186] ++(180:0.5pt) -- (264:7pt);
+	\draw[badge] 
+		(261:7.5pt) to[out=354 ,in=186] ++(0:1.5pt) -- ++(270:0.25pt) 
+		to[in=354 ,out=186] ++(180:1.5pt) -- (261:7.5pt);
 }
 
 \newcommand{\tikzpeople@conductor@painthat}{
 	\path
-		(160:3pt) arc (-180:-120:2.85pt and 1pt) coordinate (blablub);
+		(160:3pt) arc (-180:-120:2.85pt and 1pt) coordinate (tikzpeople@tmp);
 	\draw[hatbottom,rounded corners=.75pt]
-		(blablub) -- ++(340:1.5pt) .. controls ++(340:1pt) .. 
+		(tikzpeople@tmp) -- ++(340:1.5pt) .. controls ++(340:1pt) .. 
 		++(10:3.8pt) .. controls ++(45:.2pt) .. (20:3pt);
 	\draw[hatbottom]
 		(160:3pt) ++(0pt,1pt) -- (160:3pt) arc (-180:0:2.85pt and 1pt) -- 
@@ -113,15 +97,14 @@
 			(hatbadge) .. controls ++(335:1.2pt) .. ++(10:2.5pt) -- ++(0pt,-2pt);
 	\end{scope}
 	\draw[hatbadge]
-		(hatbadge) ++(0.2pt,-0.2pt) coordinate (begin) .. controls ++(190:.5pt) .. 
+		(hatbadge) ++(0.2pt,-0.2pt) coordinate (tikzpeople@tmp) .. controls ++(190:.5pt) .. 
 		++(200:.75pt) .. controls ++(270:.75pt) .. ++(300:1pt) .. controls 
-		++(70:.5pt) .. ++(55:1.1pt) .. controls ++(135:.3pt) .. (begin);
+		++(70:.5pt) .. ++(55:1.1pt) .. controls ++(135:.3pt) .. (tikzpeople@tmp);
 }
 
 \newcommand{\tikzpeople@conductor@definecolors}{
 	\definecolor{shirt}{rgb}{0.18,0.38,0.80}
 	\definecolor{hat}{rgb}{0.18,0.38,0.80}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{hair}{rgb}{0,0,0}
 	\definecolor{badge}{rgb}{0.96,0.55,0.1}
 	\definecolor{hatbadge}{rgb}{0.96,0.55,0.1}
@@ -130,22 +113,29 @@
 	\definecolor{tie}{rgb}{0.04,0.15,0.37}
 }
 \newcommand{\tikzpeople@conductor@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!80, bottom color=\tikzpeople@shirt,shading angle=45];
-	\tikzstyle{hattop}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!80, bottom color=\tikzpeople@hat,shading angle=45];
-	\tikzstyle{hatbottom}=[color=\tikzpeople@hatshield!80,top color=\tikzpeople@hatshield!60, bottom color=\tikzpeople@hatshield!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{badge}=[color=\tikzpeople@badge!80,top color=\tikzpeople@badge!40, bottom color=\tikzpeople@badge!80,shading angle=45];
-	\tikzstyle{hatbadge}=[color=\tikzpeople@hatbadge!80,top color=\tikzpeople@hatbadge!40, bottom color=\tikzpeople@hatbadge!80,shading angle=45];
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!30, bottom color=\tikzpeople@undershirt!90,shading angle=45];
-	\tikzstyle{tie}=[color=\tikzpeople@tie!80,top color=\tikzpeople@tie!40, bottom color=\tikzpeople@tie!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			shirt/.style    ={color=\tikzpeople@shirt!90,top color=\tikzpeople@shirt!90, bottom color=\tikzpeople@shirt,shading angle=45},
+			hattop/.style   ={color=\tikzpeople@hat!90,top color=\tikzpeople@hat!90, bottom color=\tikzpeople@hat,shading angle=45},
+			hatbottom/.style={color=\tikzpeople@hatshield,top color=\tikzpeople@hatshield!80, bottom color=\tikzpeople@hatshield,shading angle=45},
+			badge/.style    ={color=\tikzpeople@badge,top color=\tikzpeople@badge!70, bottom color=\tikzpeople@badge,shading angle=45},
+			hatbadge/.style ={color=\tikzpeople@hatbadge,top color=\tikzpeople@hatbadge!70, bottom color=\tikzpeople@hatbadge,shading angle=45},
+			tie/.style      ={color=\tikzpeople@tie,top color=\tikzpeople@tie!70, bottom color=\tikzpeople@tie,shading angle=45}
+		}
+	\else
+		\tikzset{
+			shirt/.style    ={color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!80, bottom color=\tikzpeople@shirt,shading angle=45},
+			hattop/.style   ={color=\tikzpeople@hat!80,top color=\tikzpeople@hat!80, bottom color=\tikzpeople@hat,shading angle=45},
+			hatbottom/.style={color=\tikzpeople@hatshield!80,top color=\tikzpeople@hatshield!60, bottom color=\tikzpeople@hatshield!90,shading angle=45},
+			badge/.style    ={color=\tikzpeople@badge!80,top color=\tikzpeople@badge!40, bottom color=\tikzpeople@badge!80,shading angle=45},
+			hatbadge/.style ={color=\tikzpeople@hatbadge!80,top color=\tikzpeople@hatbadge!40, bottom color=\tikzpeople@hatbadge!80,shading angle=45},
+			tie/.style      ={color=\tikzpeople@tie!80,top color=\tikzpeople@tie!40, bottom color=\tikzpeople@tie!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@conductor@colors}{
 	shirt/190/{-.8/-.5},	hat/140/{-.6/1.5}, hair/175/{-.75/.8}, skin/10/{.5/.6}, 
-	badge/210/{-.25/-1.2}, hatshield/155/{.15/.85}, hatbadge/30/{.4/1.3}, 
-	undershirt/350/{.4/-.15}, tie/330/{.35/-.8}%
+	badge/210/{-.25/-1.25}, hatshield/155/{.15/.85}, hatbadge/30/{.4/1.3}, 
+	undershirt/350/{.3/-.15}, tie/330/{.35/-.8}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.cowboy.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.cowboy.sty
index 6ec8baa5dc6..d6cab61496c 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.cowboy.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.cowboy.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{vest}
 \tikzpeople@addcolorkey{patches}
 \tikzpeople@addcolorkey{stitching}
@@ -61,10 +45,10 @@
 		\draw[vest,postaction={
 		      decoration={
 		          markings,
-		          mark=at position 0.16 with {\coordinate (A) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);},
-		          mark=at position 0.28 with {\coordinate (B) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);},
-		          mark=at position 0.6 with {\coordinate (C) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);},
-		          mark=at position 0.72 with {\coordinate (D) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);};
+		          mark=at position 0.16 with {\coordinate (tikzpeople@tmp1) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);},
+		          mark=at position 0.28 with {\coordinate (tikzpeople@tmp2) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);},
+		          mark=at position 0.6 with {\coordinate (tikzpeople@tmp3) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);},
+		          mark=at position 0.72 with {\coordinate (tikzpeople@tmp4) at (-.1pt*\scalingfactor,-.1pt*\scalingfactor);};
 		      },decorate
 		  }]
 			(232:3pt) to[out=315,in=90] ++(2.5pt,-5.5pt) -- 
@@ -76,15 +60,15 @@
 		          mark=between positions 0.73 and 1 step 0.045 with {\draw[stitching] (.2pt*\scalingfactor,-.1pt*\scalingfactor) -- (0,.1pt*\scalingfactor);}
 		      },decorate
 		  }]
-		  (A) to[out=300,in=105] (B) to[out=190,in=45] (C) to[out=100,in=300] 
-		  (D)  to[out=40,in=190] (A);
+		  (tikzpeople@tmp1) to[out=300,in=105] (tikzpeople@tmp2) to[out=190,in=45] (tikzpeople@tmp3) to[out=100,in=300] 
+		  (tikzpeople@tmp4)  to[out=40,in=190] (tikzpeople@tmp1);
 		\draw[vest,postaction={
 		      decoration={
 		          markings,
-		          mark=at position 0.14 with {\coordinate (A) at (.1pt*\scalingfactor,.1pt*\scalingfactor);},
-		          mark=at position 0.25 with {\coordinate (B) at (.1pt*\scalingfactor,.1pt*\scalingfactor);},
-		          mark=at position 0.615 with {\coordinate (C) at (.1pt*\scalingfactor,.1pt*\scalingfactor);},
-		          mark=at position 0.715 with {\coordinate (D) at (.1pt*\scalingfactor,.1pt*\scalingfactor);};
+		          mark=at position 0.14 with {\coordinate (tikzpeople@tmp1) at (.1pt*\scalingfactor,.1pt*\scalingfactor);},
+		          mark=at position 0.25 with {\coordinate (tikzpeople@tmp2) at (.1pt*\scalingfactor,.1pt*\scalingfactor);},
+		          mark=at position 0.615 with {\coordinate (tikzpeople@tmp3) at (.1pt*\scalingfactor,.1pt*\scalingfactor);},
+		          mark=at position 0.715 with {\coordinate (tikzpeople@tmp4) at (.1pt*\scalingfactor,.1pt*\scalingfactor);};
 		      },decorate
 		  }]
 			(314:3pt) to[out=245,in=100] ++(-.5pt,-5.5pt) -- 
@@ -96,8 +80,8 @@
 		          mark=between positions 0.76 and 1 step 0.055 with {\draw[stitching] (-.2pt*\scalingfactor,-.1pt*\scalingfactor) -- (0,.1pt*\scalingfactor);}
 		      },decorate
 		  }]
-		  (A) to[out=255,in=92] (B) to[out=357,in=178] (C) to[out=98,in=268] 
-		  (D) to[out=170,in=0] (A);
+		  (tikzpeople@tmp1) to[out=255,in=92] (tikzpeople@tmp2) to[out=357,in=178] (tikzpeople@tmp3) to[out=98,in=268] 
+		  (tikzpeople@tmp4) to[out=170,in=0] (tikzpeople@tmp1);
 		\draw[tie,shading angle=-45] 
 			(.2pt,-3.7pt) to[out=280,in=80] ++(-.2pt,-1.5pt) .. controls +(-.2pt,1pt) 
 			and +(-1.3pt,-.1pt) ..  (.2pt,-3.7pt);
@@ -113,13 +97,13 @@
 \newcommand{\tikzpeople@cowboy@painthat}{
 	\pgftransformrotate{5}
 	\path[hat] 
-		(15:3pt) ++(-.7pt,3pt) coordinate (tmp) (165:3pt) -- 
-		++(.7pt,3pt) to[out=10,in=170] (tmp) -- (15:3pt) --cycle;
+		(15:3pt) ++(-.7pt,3pt) coordinate (tikzpeople@tmp) (165:3pt) -- 
+		++(.7pt,3pt) to[out=10,in=170] (tikzpeople@tmp) -- (15:3pt) --cycle;
 	\begin{scope}
 		\pgftransformshift{\pgfpoint{0}{.2pt}}
-		\path[color=\tikzpeople@hat!40,top color=\tikzpeople@hat!10, bottom color=\tikzpeople@hat!40,shading angle=90] 
-			(203:3pt) ++(-2.5pt,3.3pt) coordinate (tmp)  arc (250:282:19pt) arc 
-			(102:-78:.3pt) arc (282:248.5:19pt) to[out=150, in= 160] (tmp);
+		\path[hatrim] 
+			(203:3pt) ++(-2.5pt,3.3pt) coordinate (tikzpeople@tmp)  arc (250:282:19pt) arc 
+			(102:-78:.3pt) arc (282:248.5:19pt) to[out=150, in= 160] (tikzpeople@tmp);
 	\end{scope}
 	\path[hat] 
 		(357:3pt) to[out=160,in=20] (183:3pt) arc (183:203:3pt) to[out=180,in=175] 
@@ -130,7 +114,6 @@
 \newcommand{\tikzpeople@cowboy@definecolors}{
 	\definecolor{shirt}{RGB}{56,52,182}
 	\definecolor{hat}{RGB}{105,49,0}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{hair}{RGB}{28,26,25}
 	\definecolor{vest}{RGB}{204,100,0}
 	\definecolor{patches}{RGB}{254,145,42}
@@ -138,21 +121,27 @@
 	\definecolor{tie}{RGB}{205,0,20}
 }
 \newcommand{\tikzpeople@cowboy@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!30, bottom color=\tikzpeople@shirt!90,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{vest}=[color=\tikzpeople@vest!80,top color=\tikzpeople@vest!40, bottom color=\tikzpeople@vest!80,shading angle=45];
-	\tikzstyle{patches}=[color=\tikzpeople@patches!80,top color=\tikzpeople@patches!40, bottom color=\tikzpeople@patches!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
-	\tikzstyle{stitching}=[line cap=round,line width=.09pt*\scalingfactor,color=\tikzpeople@stitching];
-	\tikzstyle{tie}=[color=\tikzpeople@tie!80,top color=\tikzpeople@tie!50, bottom color=\tikzpeople@tie!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			hatrim/.style={color=\tikzpeople@hat!70,top color=\tikzpeople@hat!20, bottom color=\tikzpeople@hat!70,shading angle=90},
+			vest/.style={color=\tikzpeople@vest,top color=\tikzpeople@vest!70,bottom color=\tikzpeople@vest,shading angle=45},
+			patches/.style={color=\tikzpeople@patches,top color=\tikzpeople@patches!70,bottom color=\tikzpeople@patches,shading angle=45},
+			stitching/.style={line cap=round,line width=.09pt*\scalingfactor,color=\tikzpeople@stitching},
+			tie/.style={color=\tikzpeople@tie,top color=\tikzpeople@tie!70, bottom color=\tikzpeople@tie,shading angle=45}
+		}
+	\else
+		\tikzset{
+			hatrim/.style={color=\tikzpeople@hat!40,top color=\tikzpeople@hat!10, bottom color=\tikzpeople@hat!40,shading angle=90},
+			vest/.style={color=\tikzpeople@vest!80,top color=\tikzpeople@vest!40, bottom color=\tikzpeople@vest!80,shading angle=45},
+			patches/.style={color=\tikzpeople@patches!80,top color=\tikzpeople@patches!40, bottom color=\tikzpeople@patches!80,shading angle=45},
+			stitching/.style={line cap=round,line width=.09pt*\scalingfactor,color=\tikzpeople@stitching},
+			tie/.style={color=\tikzpeople@tie!80,top color=\tikzpeople@tie!50, bottom color=\tikzpeople@tie!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@cowboy@colors}{
-	shirt/350/{1.1/-.5}, hair/180/{-.7/.8}, hat/160/{-1/1}, tie/10/{.1/-.25}, 
+	shirt/350/{1/-.5}, hair/180/{-.7/.7}, hat/160/{-1/1}, tie/10/{.1/-.25}, 
 	skin/30/{.5/.8}, vest/195/{-.7/-.3}, patches/210/{-.5/-.7}, 
-	stitching/330/{-.24/-.82,.56/-.67}%
+	stitching/330/{-.18/-.85,.53/-.71}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.criminal.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.criminal.sty
index 943fe664607..1ed601e3a42 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.criminal.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.criminal.sty
@@ -13,27 +13,11 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
-\tikzpeople@addcolorkey{hat}
 
 \newcommand{\tikzpeople@criminal@paint}{
 	{
-		\pgftransformshift{\pgfpoint{0}{-1.2pt}}
+		\pgftransformyshift{-1.2pt}
 		\tikzpeople@person@paintrighthorn
 	}
 	\tikzpeople@person@painthead
@@ -45,7 +29,7 @@
 	\fi
 	\tikzpeople@criminal@painthat
 	{
-		\pgftransformshift{\pgfpoint{0}{-1.2pt}}
+		\pgftransformyshift{-1.2pt}
 		\tikzpeople@person@paintlefthorn
 	}
 	\tikzpeople@person@painthalo
@@ -60,7 +44,7 @@
 			( 5.0pt,-7.0pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) .. 
 			(-4.0pt,-8.0pt) (205:3.1pt) arc (205:335:3.1pt) to[out=200,in=340] 
 			(205:3.1pt) --cycle;
-		\draw[color=\tikzpeople@shirt!80,line width=.4*\scalingfactor,cap=round] 
+		\draw[color=\tikzpeople@shirt\if@tikzpeople@saturated\else!80\fi,line width=.4*\scalingfactor,cap=round] 
 			(2pt,-8.7pt) to[out=90,in=290] (290:3.1pt) to[out=45,in=270] (310:2.25pt);
 		\draw[color=\tikzpeople@details,line width=.17*\scalingfactor,cap=round] 
 			(2pt,-8.7pt) to[out=90,in=290] (290:3.1pt) to[out=45,in=270] (310:2.25pt);
@@ -91,22 +75,23 @@
 \newcommand{\tikzpeople@criminal@definecolors}{
 	\definecolor{shirt}{RGB}{5,48,167}
 	\definecolor{hat}{RGB}{4,4,20}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{details}{RGB}{230,232,234}
 	\definecolor{hair}{rgb}{0,0,0}
 }
 \newcommand{\tikzpeople@criminal@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!50, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{details}=[color=\tikzpeople@details,top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=-45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=-45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			details/.style={color=\tikzpeople@details,top color=\tikzpeople@details!70, bottom color=\tikzpeople@details,shading angle=45}
+		}
+	\else
+		\tikzset{
+			shirt/.style  ={color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!50, bottom color=\tikzpeople@shirt!80,shading angle=45},
+			details/.style={color=\tikzpeople@details,top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@criminal@colors}{
 	shirt/340/{1/-.75}, hat/160/{-.5/1.5}, skin/20/{.5/.75}, 
-	details/200/{.325/-.25}%
+	details/200/{.27/-.25}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.dave.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.dave.sty
index 79ffedfc58d..ec8520d47ff 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.dave.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.dave.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
 \tikzpeople@addcolorkey{tie}
 
 \newcommand{\tikzpeople@dave@paint}{
@@ -43,7 +27,6 @@
 }
 
 \newcommand{\tikzpeople@dave@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{shirt}{RGB}{136,190,226}
 	\definecolor{tie}{RGB}{173,36,47}
 	\definecolor{undershirt}{rgb}{0.9,0.9,0.9}
@@ -51,14 +34,15 @@
 }
 
 \newcommand{\tikzpeople@dave@definestyles}{
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45];
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=90];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
-	\tikzstyle{tie}=[color=\tikzpeople@tie!80,top color=\tikzpeople@tie!40, bottom color=\tikzpeople@tie!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			tie/.style={color=\tikzpeople@tie,top color=\tikzpeople@tie!70, bottom color=\tikzpeople@tie,shading angle=45}
+		}
+	\else
+		\tikzset{
+			tie/.style={color=\tikzpeople@tie!80,top color=\tikzpeople@tie!40, bottom color=\tikzpeople@tie!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@dave@painthair}{
@@ -91,7 +75,8 @@
 				(250:2.9pt) to[out=300,in=280,looseness=2] (310:2.8pt) -- cycle;
 			\path[postaction={decorate},decoration={
 				markings,
-				mark=between positions 0.04 and 1 step 0.04 with {\pgftransformscale{\scalingfactor}\fill[tie] (0pt,0pt) circle (.1pt);}
+				mark=between positions 0.04 and 1 step 0.04 with {\pgftransformscale{\scalingfactor}
+				\fill[tie] (0pt,0pt) circle (.1pt);}
 			}]
 			(245:2.9pt) to[out=300,in=270,looseness=3] (311:3pt);
 		\else
@@ -113,16 +98,20 @@
 		\if@tikzpeople@mirrored
 			\path[postaction={decorate},decoration={
 				markings,
-				mark=between positions 0.11 and .54 step 0.02 with {\pgftransformscale{\scalingfactor}\draw[shirt] (0pt,0pt) -- (0pt,.3pt) arc (360:180:.15pt) -- (-.3pt,0pt);},
-				mark=between positions 0.54 and .91 step 0.02 with {\pgftransformscale{\scalingfactor}\draw[shirt] (0pt,0pt) -- (0pt,.3pt) arc (180:360:.15pt) -- (.3pt,0pt);}
+				mark=between positions 0.11 and .54 step 0.02 with {\pgftransformscale{\scalingfactor}
+				\draw[shirt] (0pt,0pt) -- (0pt,.3pt) arc (360:180:.15pt) -- (-.3pt,0pt);},
+				mark=between positions 0.54 and .91 step 0.02 with {\pgftransformscale{\scalingfactor}
+				\draw[shirt] (0pt,0pt) -- (0pt,.3pt) arc (180:360:.15pt) -- (.3pt,0pt);}
 				}]
 				(-1.9pt,-1pt) to[out=290,in=130,looseness=.75] (2pt,-7.8pt) 
 				to[out=80,in=280,looseness=.75] (1.9pt,-1pt);
 		\else
 			\path[postaction={decorate},decoration={
 				markings,
-				mark=between positions 0.11 and .54 step 0.02 with {\pgftransformscale{\scalingfactor}\draw[shirt] (0pt,0pt) -- (0pt,-.3pt) arc (0:180:.15pt) -- (-.3pt,0pt);},
-				mark=between positions 0.54 and .91 step 0.02 with {\pgftransformscale{\scalingfactor}\draw[shirt] (0pt,0pt) -- (0pt,-.3pt) arc (180:0:.15pt) -- (.3pt,0pt);}
+				mark=between positions 0.11 and .54 step 0.02 with {\pgftransformscale{\scalingfactor}
+				\draw[shirt] (0pt,0pt) -- (0pt,-.3pt) arc (0:180:.15pt) -- (-.3pt,0pt);},
+				mark=between positions 0.54 and .91 step 0.02 with {\pgftransformscale{\scalingfactor}
+				\draw[shirt] (0pt,0pt) -- (0pt,-.3pt) arc (180:0:.15pt) -- (.3pt,0pt);}
 				}]
 				(-1.9pt,-1pt) to[out=290,in=130,looseness=.75] (2pt,-7.8pt) 
 				to[out=80,in=280,looseness=.75] (1.9pt,-1pt);
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.devil.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.devil.sty
new file mode 100644
index 00000000000..56f792f4221
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.devil.sty
@@ -0,0 +1,77 @@
+%% Copyright 2016 Nils Fleischhacker
+%%
+%% This work may be distributed and/or modified under the 
+%% conditions of the LaTeX Project Public License, either 
+%% version 1.3 of this license or (at your option) any later 
+%% version. The latest version of this license is in
+%%
+%%   http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of 
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Nils Fleischhacker.
+\newcommand{\tikzpeople@devil@paint}{
+	\@tikzpeople@eviltrue
+	\tikzpeople@devil@painttail
+	\tikzpeople@person@paintshirt
+	\tikzpeople@devil@painttorso
+	\tikzpeople@person@paintrighthorn
+	\tikzpeople@person@painthead
+	\tikzpeople@person@painthairstyletwo
+	\tikzpeople@person@paintgoatee
+	\tikzpeople@person@paintlefthorn
+	\tikzpeople@person@painthalo
+}
+
+\newcommand{\tikzpeople@devil@definecolors}{
+	\definecolor{skin}{RGB}{216,52,38}
+	\definecolor{hair}{named}{black}
+	\definecolor{shirt}{named}{black}
+}
+
+\newcommand{\tikzpeople@devil@definestyles}{
+	\if@tikzpeople@saturated
+		\tikzset{
+			tail/.style ={color=\tikzpeople@skin,double=\tikzpeople@skin!90,double distance=.4pt*\scalingfactor},
+			horns/.style={skin}
+		}
+	\else
+		\tikzset{
+			skin/.style ={color=\tikzpeople@skin!80,top color=\tikzpeople@skin!50,bottom color=\tikzpeople@skin!80},
+			tail/.style ={color=\tikzpeople@skin!80,double=\tikzpeople@skin!70,double distance=.4pt*\scalingfactor},
+			horns/.style={skin}
+		}
+	\fi
+}
+
+\newcommand{\tikzpeople@devil@painttail}{
+		\draw[tail]
+			(250:7pt) to[out=80,in=10] ++(130:3.5pt) to[out=190,in=190,looseness=3] ++(95:2.5pt) to[out=10,in=300,looseness=2] ++(100:3pt) coordinate (tikzpeople@tmp);
+		{
+		\pgftransformrotate{30}
+		\draw[skin] (tikzpeople@tmp) ++(-.1pt,0) to[out=200,in=80] ++(-.8pt,-.7pt) to[out=90,in=220] ++(.9pt,2pt) to[out=320,in=90] ++(.9pt,-2pt) to[out=80,in=340] ++(-.8pt,.7pt);
+		}
+}
+
+\newcommand{\tikzpeople@devil@painttorso}{
+	\begin{scope}
+		\clip 
+		(-4.0pt,-8.0pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
+		( 5.0pt,-7.0pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) .. 
+		(-4.0pt,-8.0pt) -- cycle;
+		\draw[skin]
+			(-1.9pt,-1pt) to[out=290,in=80]
+			(-1.2pt,-9.2pt) -- (4.5pt,-9pt) to[out=120,in=280] (1.6pt,-1pt);
+		\draw[color=\tikzpeople@shirt\if@tikzpeople@saturated\else!80\fi]
+			(-4.0pt,-8.0pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
+			( 5.0pt,-7.0pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) .. 
+			(-4.0pt,-8.0pt) -- cycle;
+	\end{scope}
+}
+
+\newcommand{\tikzpeople@devil@colors}{
+	shirt/200/{-1/-.6},	hair/160/{-.75/.7}, skin/20/{.6/.7,.15/-.4}%
+}
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.duck.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.duck.sty
new file mode 100644
index 00000000000..e50f54fd065
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.duck.sty
@@ -0,0 +1,104 @@
+%% Copyright 2016 Nils Fleischhacker
+%%
+%% This work may be distributed and/or modified under the 
+%% conditions of the LaTeX Project Public License, either 
+%% version 1.3 of this license or (at your option) any later 
+%% version. The latest version of this license is in
+%%
+%%   http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of 
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Nils Fleischhacker.
+\tikzpeople@addcolorkey{bill}
+\tikzpeople@addcolorkey{tongue}
+
+\newcommand{\tikzpeople@duck@paint}{
+	\tikzpeople@person@paintshirt
+	\tikzpeople@duck@painttorso
+	\tikzpeople@person@paintrighthorn
+	\tikzpeople@person@painthead
+	\tikzpeople@duck@paintbill
+	\tikzpeople@person@painthair
+	\tikzpeople@person@paintlefthorn
+	\tikzpeople@person@painthalo
+}
+
+\newcommand{\tikzpeople@duck@definecolors}{
+	\definecolor{skin}{RGB}{252,167,0}
+	\definecolor{bill}{RGB}{247, 78, 19}
+	\definecolor{hair}{named}{black}
+	\definecolor{tongue}{RGB}{246,38,10}
+}
+
+\newcommand{\tikzpeople@duck@definestyles}{
+	\if@tikzpeople@saturated
+		\tikzset{
+			shirt/.style   ={skin},
+			bill/.style    ={color=\tikzpeople@bill,top color=\tikzpeople@bill!70,bottom color=\tikzpeople@bill,shading angle=45},
+			tongue/.style  ={color=\tikzpeople@tongue,top color=\tikzpeople@tongue!30!\tikzpeople@bill,bottom color=\tikzpeople@tongue},
+			feathers/.style={color=\tikzpeople@skin,decoration={zigzag,segment length=\scalingfactor*.8pt,amplitude=\scalingfactor*.25pt},decorate,line width=\scalingfactor*.05pt}
+		}
+	\else
+		\tikzset{
+			shirt/.style   ={skin},
+			bill/.style    ={color=\tikzpeople@bill!80,top color=\tikzpeople@bill!50,bottom color=\tikzpeople@bill!80,shading angle=45},
+			tongue/.style  ={color=\tikzpeople@tongue!80,outer color=\tikzpeople@tongue!20!\tikzpeople@bill!80,inner color=\tikzpeople@tongue!80},
+			feathers/.style={color=\tikzpeople@skin!80,decoration={zigzag,segment length=\scalingfactor*.8pt,amplitude=\scalingfactor*.25pt},decorate,line width=\scalingfactor*.05pt}
+		}
+	\fi
+}
+
+\newcommand{\tikzpeople@duck@painttorso}{
+	\begin{scope}
+		\clip 
+			(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. 
+			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt,0pt) ..
+			(-4pt,-8pt);
+		\draw[feathers]
+			(-3.5 pt,-4.2pt) .. controls (-2pt,-6.2pt) and (3pt,-5.2pt) .. 
+			( 4.3pt,-3.7pt);
+		\draw[feathers]
+			(-4.2pt,-5.7pt) .. controls (-2pt,-7.7pt) and (3pt,-6.7pt) .. 
+			(4.7pt, -4.9pt);
+		\draw[feathers]
+			(-4.3pt,-7.2pt) .. controls (-2pt,-9.2pt) and (3pt,-8.2pt) .. 
+			(5pt, -6.2pt);
+	\end{scope}
+}
+
+\newcommand{\tikzpeople@duck@paintbill}{
+	\path
+		(263:1.6pt) coordinate (tikzpeople@bill1) +(0,.12pt) coordinate 
+		(tikzpeople@bill2) +(0,-.12pt) coordinate (tikzpeople@bill3) (340:3pt) 
+		++(350:1.5pt) coordinate (tikzpeople@bill4) +(0,.12pt) coordinate 
+		(tikzpeople@bill5) +(0,-.12pt) coordinate (tikzpeople@bill6) ++(200:1.8pt) 
+		coordinate (tikzpeople@bill7) +(0,.12pt) coordinate (tikzpeople@bill8) 
+		+(0,-.15pt) coordinate (tikzpeople@bill9)--cycle;
+	\draw[bill] 
+		(tikzpeople@bill3) to[out=320,in=190] (tikzpeople@bill6);
+	\draw[tongue]
+		(tikzpeople@bill7) to[out=5,in=215] (tikzpeople@bill4) to[out=170,in=10] 
+		(tikzpeople@bill7)--cycle;
+	\draw[bill] 
+		(tikzpeople@bill1) to[out=340,in=190] (tikzpeople@bill7) to[out=5,in=215] 
+		(tikzpeople@bill4) to[out=0,in=0] (tikzpeople@bill6) to[out=220,in=0] 
+		(tikzpeople@bill9) to[out=190,in=340] (tikzpeople@bill3) to[out=160,in=160] 
+		(tikzpeople@bill1)--cycle;
+	\draw[bill] 
+		(tikzpeople@bill1) to[out=340,in=190] (tikzpeople@bill7) to[out=0,in=180] 
+		(tikzpeople@bill4) to[out=0,in=0] (tikzpeople@bill5) to[out=170,in=10] 
+		(tikzpeople@bill8) to[out=190,in=340] (tikzpeople@bill2) to[out=160,in=160] 
+		(tikzpeople@bill1)--cycle;
+	\draw[bill,line join=bevel] 
+		(tikzpeople@bill2) to[out=340,in=190] (tikzpeople@bill8) to[out=10,in=170] 
+		(tikzpeople@bill5) to[out=160,in=330] (340:3pt) to[out=180,in=0] (337:1.7pt)
+		to[out=180,in=0,in looseness=1.2] (tikzpeople@bill2)--cycle;
+}
+
+\newcommand{\tikzpeople@duck@colors}{
+	skin/200/{-1/-.6},	hair/160/{-.75/.8}, bill/20/{.6/.5}, tongue/0/{.9/.42}%
+}
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.graduate.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.graduate.sty
index c4831b4adad..127fd850fc4 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.graduate.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.graduate.sty
@@ -13,24 +13,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{stripes}
-\tikzpeople@addcolorkey{undershirt}
-\tikzpeople@addcolorkey{hat}
 
 \newcommand{\tikzpeople@graduate@paint}{
 	\tikzpeople@person@paintshirt
@@ -73,7 +56,7 @@
 			( 2.2pt,-8 pt) .. controls ( 2.3pt,-6  pt) and ( 2.2pt,-4  pt) ..
 			( 2  pt,-2 pt) -- cycle;
 	\end{scope}
-	\draw[\tikzpeople@shirt!80]
+	\draw[color=\tikzpeople@shirt\if@tikzpeople@saturated\else!80\fi]
 		(-4.0pt,-8.0pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
 		( 5.0pt,-7.0pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) .. 
 		(-4.0pt,-8.0pt);
@@ -86,7 +69,7 @@
 		(20:3pt) -- +(0pt,2pt) -- (175:3pt |- 0,3pt) -- cycle;
 	\draw[hat]
 		(4.4pt,3.6pt) -- (-1.5pt,4pt) -- (-4.3pt,2.5pt) -- (2pt,2pt);
-	\draw[color=\tikzpeople@hat!80,line width=0.15*\scalingfactor]
+	\draw[color=\tikzpeople@hat\if@tikzpeople@saturated\else!80\fi,line width=0.15*\scalingfactor,cap=round]
 		(0pt,3.2pt) -- (-3.4pt,2.5pt) arc (90:180:0.2pt) -- (-3.5pt,-0.5pt);
 	\draw[hat]
 		(-3.6pt,-0.5pt) -- (-3.7pt,-1.5pt) .. controls (-3.5pt,-1.6pt) ..
@@ -101,19 +84,17 @@
 	\definecolor{hat}{rgb}{0,0,0}
 	\definecolor{undershirt}{RGB}{232,232,232}
 	\definecolor{stripes}{rgb}{0.16,0.55,0.31}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 }
 \newcommand{\tikzpeople@graduate@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!30, bottom color=\tikzpeople@undershirt!90,shading angle=45];
-	\tikzstyle{stripes}=[color=\tikzpeople@stripes!80,top color=\tikzpeople@stripes!40, bottom color=\tikzpeople@stripes!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45]
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45]
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45]
+	\if@tikzpeople@saturated
+		\tikzset{
+			stripes/.style={color=\tikzpeople@stripes,top color=\tikzpeople@stripes!70, bottom color=\tikzpeople@stripes,shading angle=45}
+		}
+	\else
+		\tikzset{
+			stripes/.style={color=\tikzpeople@stripes!80,top color=\tikzpeople@stripes!40, bottom color=\tikzpeople@stripes!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@graduate@colors}{
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.groom.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.groom.sty
index b90667e6398..2bcc815842f 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.groom.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.groom.sty
@@ -13,23 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{tie}
 
 \newcommand{\tikzpeople@groom@paint}{
@@ -80,27 +63,27 @@
 	\begin{scope}
 		\pgftransformrotate{10}
 		\path[hat]
-			(30:3pt) ++(0pt,3pt) coordinate (tmp) 
-			(150:3pt) to[out=85,in=275] ++(0pt,3pt) to[out=10,in=170] (tmp) 
+			(30:3pt) ++(0pt,3pt) coordinate (tikzpeople@tmp) 
+			(150:3pt) to[out=85,in=275] ++(0pt,3pt) to[out=10,in=170] (tikzpeople@tmp) 
 			to[out=265,in=95] (30:3pt) --cycle;
 		\begin{scope}
 			\clip 
-				(30:3pt) ++(0pt,3pt) coordinate (tmp) (150:3pt) to[out=85,in=275] 
-				++(0pt,3pt) to[out=10,in=170] (tmp) to[out=265,in=95] (30:3pt) --cycle;
-			\path[color=\tikzpeople@hat!60,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!60,shading angle=45]
-				(30:3pt) ++(0pt,1.3pt) coordinate (tmp) (150:3pt) ++(0pt,.7pt) 
-				coordinate (tmp2) (150:3pt) ++(0pt,1.5pt) to[out=355,in=185] (tmp) -- 
-				++(0pt,-.7pt) to[out=185,in=355] (tmp2) --cycle;
+				(30:3pt) ++(0pt,3pt) coordinate (tikzpeople@tmp) (150:3pt) to[out=85,in=275] 
+				++(0pt,3pt) to[out=10,in=170] (tikzpeople@tmp) to[out=265,in=95] (30:3pt) --cycle;
+			\path[hatwrap]
+				(30:3pt) ++(0pt,1.3pt) coordinate (tikzpeople@tmp) (150:3pt) ++(0pt,.7pt) 
+				coordinate (tikzpeople@tmp2) (150:3pt) ++(0pt,1.5pt) to[out=355,in=185] (tikzpeople@tmp) -- 
+				++(0pt,-.7pt) to[out=185,in=355] (tikzpeople@tmp2) --cycle;
 		\end{scope}
 	\end{scope}
 	\begin{scope}
 		\pgftransformrotate{4}
 		\begin{scope}
 			\pgftransformshift{\pgfpoint{-.05pt}{.075pt}}
-			\path[color=\tikzpeople@hat!40,top color=\tikzpeople@hat!10, bottom color=\tikzpeople@hat!40,shading angle=90]
-				(170:3pt) ++(-.5pt,1.75pt) coordinate (tmp)  arc (255:291:11pt) arc 
+			\path[hatrim]
+				(170:3pt) ++(-.5pt,1.75pt) coordinate (tikzpeople@tmp)  arc (255:291:11pt) arc 
 				(111:-69:.1pt) arc (291:253:11pt) to[out=163, in= 163,in looseness=3] 
-				(tmp);
+				(tikzpeople@tmp);
 		\end{scope}
 		\path[hat]
 			(25:3pt) to[out=170,in=10] (160:3pt) arc (160:170:3pt) 
@@ -112,25 +95,28 @@
 \newcommand{\tikzpeople@groom@definecolors}{
 	\definecolor{shirt}{rgb}{0,0,0}
 	\definecolor{hat}{rgb}{0,0,0}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{undershirt}{RGB}{232,232,232}
 	\definecolor{tie}{RGB}{194,0,0}
 }
 
 \newcommand{\tikzpeople@groom@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!50, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{tie}=[color=\tikzpeople@tie!80,inner color=\tikzpeople@tie!60, outer color=\tikzpeople@tie!80];
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			hatrim/.style ={color=\tikzpeople@hat!60,top color=\tikzpeople@hat!30, bottom color=\tikzpeople@hat!60,shading angle=90},
+			hatwrap/.style={color=\tikzpeople@hat!80,top color=\tikzpeople@hat!60, bottom color=\tikzpeople@hat!80,shading angle=45},
+			tie/.style    ={color=\tikzpeople@tie,inner color=\tikzpeople@tie!80, outer color=\tikzpeople@tie}
+		}
+	\else
+		\tikzset{
+			hatrim/.style ={color=\tikzpeople@hat!40,top color=\tikzpeople@hat!10, bottom color=\tikzpeople@hat!40,shading angle=90},
+			hatwrap/.style={color=\tikzpeople@hat!60,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!60,shading angle=45},
+			shirt/.style  ={color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!50, bottom color=\tikzpeople@shirt!80,shading angle=45},
+			tie/.style    ={color=\tikzpeople@tie!80,inner color=\tikzpeople@tie!60, outer color=\tikzpeople@tie!80}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@groom@colors}{
 	shirt/200/{-.75/-.8}, hair/160/{-.7/.9}, hat/20/{.3/2}, skin/0/{.5/.7}, 
-	undershirt/340/{.25/-.5},tie/180/{-.15/-.15}%
+	undershirt/340/{.25/-.5},tie/180/{-.15/-.25}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty
index 0500ae86c87..d90baca43a0 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty
@@ -13,23 +13,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{collar}
 \tikzpeople@addcolorkey{lining}
 
@@ -50,18 +34,18 @@
 		\draw[lining,postaction={
 				    decoration={
 				        markings,
-				        mark=at position 0.1  with {\coordinate (A) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.23 with {\coordinate (B) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.50 with {\coordinate (C) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.62 with {\coordinate (D) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.75 with {\coordinate (E) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);};
+				        mark=at position 0.1  with {\coordinate (tikzpeople@tmp1) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.23 with {\coordinate (tikzpeople@tmp2) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.50 with {\coordinate (tikzpeople@tmp3) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.62 with {\coordinate (tikzpeople@tmp4) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.75 with {\coordinate (tikzpeople@tmp5) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);};
 				    },decorate
 				}] (2pt,-8.7pt) to[out=90,in=290] (290:3.6pt) -- (300:3.4pt) -- ++(102:0.6pt);
-    \draw[details] (A) circle (0.2pt);
-    \draw[details] (B) circle (0.2pt);
-    \draw[details] (C) circle (0.2pt);
-    \draw[details] (D) circle (0.2pt);
-    \draw[details] (E) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp1) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp2) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp3) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp4) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp5) circle (0.2pt);
 	\end{scope}
 }
 
@@ -87,21 +71,27 @@
 \newcommand{\tikzpeople@guard@definecolors}{
 	\definecolor{shirt}{rgb}{0.62,0.1,0}
 	\definecolor{hat}{rgb}{0,0,0}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{collar}{rgb}{0.29,0.29,0.29}
 	\definecolor{details}{rgb}{1,0.82,0}
 	\definecolor{lining}{rgb}{0.9,0.9,0.9}
 }
 \newcommand{\tikzpeople@guard@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{collar}=[color=\tikzpeople@collar!80,top color=\tikzpeople@collar!40, bottom color=\tikzpeople@collar!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{details}=[color=\tikzpeople@details!80, top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80, shading angle=45];
-	\tikzstyle{lining}=[color=\tikzpeople@lining];
+	\if@tikzpeople@saturated
+		\tikzset{
+			collar/.style ={color=\tikzpeople@collar,top color=\tikzpeople@collar!70, bottom color=\tikzpeople@collar,shading angle=45},
+			details/.style={color=\tikzpeople@details, top color=\tikzpeople@details!70, bottom color=\tikzpeople@details, shading angle=45},
+			lining/.style ={color=\tikzpeople@lining}
+		}
+	\else
+		\tikzset{
+			collar/.style ={color=\tikzpeople@collar!80,top color=\tikzpeople@collar!40, bottom color=\tikzpeople@collar!80,shading angle=45},
+			details/.style={color=\tikzpeople@details!80, top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80, shading angle=45},
+			lining/.style ={color=\tikzpeople@lining}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@guard@colors}{
 	shirt/200/{-.75/-1}, hat/160/{-.75/1.3}, skin/20/{.5/.7}, collar/0/{.2/.1}, 
-	details/180/{.49/-.32,-.5/.35}, lining/340/{.44/-.8}%
+	details/180/{.45/-.4,-.5/.3}, lining/340/{.4/-.8}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.jester.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.jester.sty
index 32c08174653..12105544174 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.jester.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.jester.sty
@@ -13,24 +13,8 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
 \tikzpeople@addcolorkey{pattern}
-\tikzpeople@addcolorkey{hat}
 
 \newcommand{\tikzpeople@jester@paint}{
 	{
@@ -54,24 +38,24 @@
 		(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. 
 		( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt,0pt) ..
 		(-4pt,-8pt);
-		\coordinate (inc) at (2pt,.4pt);
-		\path  (-10.5pt,-4pt)coordinate (T1)
-			++(inc) coordinate (T2) ++(inc) coordinate (T3)	++(inc) coordinate (T4)
-			++(inc) coordinate (T5)	++(inc) coordinate (T6)	++(inc) coordinate (T7)
-			++(inc) coordinate (T8)	++(inc) coordinate (T9)	++(inc) coordinate (T10)
-			++(inc) coordinate (T11);
-		\path  (-7pt,-12pt) coordinate (B1)
-			++(inc) coordinate (B2) ++(inc) coordinate (B3)	++(inc) coordinate (B4)
-			++(inc) coordinate (B5) ++(inc) coordinate (B6)	++(inc) coordinate (B7)
-			++(inc) coordinate (B8) ++(inc) coordinate (B9);
-		\fill[pattern] (T2)
-			to[in=100,out=300] (B2) to[in=260,out=50] (T6) to[in=100,out=300] (B6)
-			to[in=260,out=50] (T10)	-- (T11) to[in=50,out=260] (B7)
-			to[in=300,out=100] (T7) to[in=50,out=260] (B3) to[in=300,out=100] (T3) -- 
-			(T4) to[in=100,out=300] (B4) to[in=260,out=50] (T8) 
-			to[in=100,out=300] (B8) -- (B9)	to[in=300,out=100] (T9)
-			to[in=50,out=260] (B5) to[in=300,out=100] (T5) to[in=50,out=260](B1)
-			to[in=300,out=100](T1) --cycle;
+		\coordinate (tikzpeople@tmp) at (2pt,.4pt);
+		\path  (-10.5pt,-4pt)coordinate (tikzpeople@tmp1)
+			++(tikzpeople@tmp) coordinate (tikzpeople@tmp2) ++(tikzpeople@tmp) coordinate (tikzpeople@tmp3)	++(tikzpeople@tmp) coordinate (tikzpeople@tmp4)
+			++(tikzpeople@tmp) coordinate (tikzpeople@tmp5)	++(tikzpeople@tmp) coordinate (tikzpeople@tmp6)	++(tikzpeople@tmp) coordinate (tikzpeople@tmp7)
+			++(tikzpeople@tmp) coordinate (tikzpeople@tmp8)	++(tikzpeople@tmp) coordinate (tikzpeople@tmp9)	++(tikzpeople@tmp) coordinate (tikzpeople@tmp10)
+			++(tikzpeople@tmp) coordinate (tikzpeople@tmp11);
+		\path  (-7pt,-12pt) coordinate (tikzpeople@tmp12)
+			++(tikzpeople@tmp) coordinate (tikzpeople@tmp13) ++(tikzpeople@tmp) coordinate (tikzpeople@tmp14)	++(tikzpeople@tmp) coordinate (tikzpeople@tmp15)
+			++(tikzpeople@tmp) coordinate (tikzpeople@tmp16) ++(tikzpeople@tmp) coordinate (tikzpeople@tmp17)	++(tikzpeople@tmp) coordinate (tikzpeople@tmp18)
+			++(tikzpeople@tmp) coordinate (tikzpeople@tmp19) ++(tikzpeople@tmp) coordinate (tikzpeople@tmp20);
+		\fill[pattern] (tikzpeople@tmp2)
+			to[in=100,out=300] (tikzpeople@tmp13) to[in=260,out=50] (tikzpeople@tmp6) to[in=100,out=300] (tikzpeople@tmp17)
+			to[in=260,out=50] (tikzpeople@tmp10)	-- (tikzpeople@tmp11) to[in=50,out=260] (tikzpeople@tmp18)
+			to[in=300,out=100] (tikzpeople@tmp7) to[in=50,out=260] (tikzpeople@tmp14) to[in=300,out=100] (tikzpeople@tmp3) -- 
+			(tikzpeople@tmp4) to[in=100,out=300] (tikzpeople@tmp15) to[in=260,out=50] (tikzpeople@tmp8) 
+			to[in=100,out=300] (tikzpeople@tmp19) -- (tikzpeople@tmp20)	to[in=300,out=100] (tikzpeople@tmp9)
+			to[in=50,out=260] (tikzpeople@tmp16) to[in=300,out=100] (tikzpeople@tmp5) to[in=50,out=260](tikzpeople@tmp12)
+			to[in=300,out=100](tikzpeople@tmp1) --cycle;
 	\end{scope}
 }
 
@@ -80,18 +64,18 @@
 		\pgftransformrotate{10}
 		\draw[hat] 
 			(180:3.2pt) to[out=60,in=60] ++(91:3pt) to[out=240,in=90] ++(271:.9pt) 
-			to[out=270,in=85] ++(268:.9pt) coordinate (bell1) to[out=130,in=170] 
+			to[out=270,in=85] ++(268:.9pt) coordinate (tikzpeople@tmp1) to[out=130,in=170] 
 			++(73:4pt) to[out=350,in=180] (.5pt,3.3pt) to[out=0,in=200] ++(45:2.5pt) 
-			to[out=20,in=80] ++(290:4pt) coordinate (bell2) to[out=100,in=75] 
+			to[out=20,in=80] ++(290:4pt) coordinate (tikzpeople@tmp2) to[out=100,in=75] 
 			++(120:2.1pt) to[out=255,in=100] (0:3.1pt) to[out=170,in=10] (180:3.1pt);
 		\path[pattern]
 			(0:3.2pt) ++(0,-.2pt) to[out=170,in=10] ++(180:6.4pt) to[out=110,in=250] 
 			++(0,1.2pt) to[out=10,in=170] ++(0:6.4pt) to[out=290,in=70] ++(0,-1.22pt)
 			--cycle;
 		\begin{scope}
-			\clip (bell1) circle (.4pt) (bell2) circle (.4pt);
-			\path[details] (bell1) ++(-.15pt,.15pt) circle (.7pt);
-			\path[details] (bell2) ++(-.15pt,.15pt) circle (.7pt);
+			\clip (tikzpeople@tmp1) circle (.4pt) (tikzpeople@tmp2) circle (.4pt);
+			\path[details] (tikzpeople@tmp1) ++(-.15pt,.15pt) circle (.7pt);
+			\path[details] (tikzpeople@tmp2) ++(-.15pt,.15pt) circle (.7pt);
 		\end{scope}
 	\end{scope}
 }
@@ -100,20 +84,20 @@
 	\definecolor{shirt}{RGB}{100,187,41}
 	\definecolor{pattern}{RGB}{208,48,0}
 	\definecolor{hat}{RGB}{100,187,41}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{details}{RGB}{225,87,0}
 }
 \newcommand{\tikzpeople@jester@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!50, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{pattern}=[color=\tikzpeople@pattern!80,top color=\tikzpeople@pattern!50, bottom color=\tikzpeople@pattern!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{details}=[color=\tikzpeople@details,inner color=\tikzpeople@details!30, outer color=\tikzpeople@details!90];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=-45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=-45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			pattern/.style={color=\tikzpeople@pattern,top color=\tikzpeople@pattern!70, bottom color=\tikzpeople@pattern,shading angle=45},
+			details/.style={color=\tikzpeople@details,inner color=\tikzpeople@details!50, outer color=\tikzpeople@details}
+		}
+	\else
+		\tikzset{
+			pattern/.style={color=\tikzpeople@pattern!80,top color=\tikzpeople@pattern!40, bottom color=\tikzpeople@pattern!80,shading angle=45},
+			details/.style={color=\tikzpeople@details,inner color=\tikzpeople@details!30, outer color=\tikzpeople@details!90}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@jester@colors}{
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.judge.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.judge.sty
index 4d3ecb06414..c1539ee9ddf 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.judge.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.judge.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
 \tikzpeople@addcolorkey{hairshadow}
 
 \newcommand{\tikzpeople@judge@paint}{
@@ -44,7 +28,6 @@
 }
 
 \newcommand{\tikzpeople@judge@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{shirt}{RGB}{0,0,0}
 	\definecolor{undershirt}{rgb}{0.9,0.9,0.9}
 	\definecolor{hair}{RGB}{204,161,107}
@@ -52,38 +35,47 @@
 }
 
 \newcommand{\tikzpeople@judge@definestyles}{
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45];
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=90];
-	\tikzstyle{hairshadow}=[color=\tikzpeople@hairshadow];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			hairshadow/.style={color=\tikzpeople@hairshadow}
+		}
+	\else
+		\tikzset{
+			hairshadow/.style={color=\tikzpeople@hairshadow}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@judge@paintlefthair}{
-	\draw[hair,join=bevel, shading angle=45] (25:2.7pt) to[out=330,in=80,out looseness=.5] (3.3pt,-3pt) -- (2pt,-3pt); 
+	\draw[hair,join=bevel, shading angle=45] 
+		(25:2.7pt) to[out=330,in=80,out looseness=.5] (3.3pt,-3pt) -- (2pt,-3pt); 
 	\path[postaction={decorate},decoration={
 		markings,
 		mark=between positions 0.03 and 1 step .76pt*\scalingfactor with {\pgftransformscale{\scalingfactor}
 		\if@tikzpeople@mirrored
 			\pgftransformyscale{-1}
 		\fi
-		\path[fill=\tikzpeople@hairshadow] (.39pt,-.06pt) ellipse (.39pt and .27pt + 0.02*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number});
-		\path[fill=\tikzpeople@hair!50,draw=\tikzpeople@hairshadow] (.39pt,0pt) ellipse (.39pt and .27pt +0.02*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number}); 
+		\path[fill=\tikzpeople@hairshadow] 
+			(.39pt,-.06pt) ellipse 
+			(.39pt and .27pt + 0.02*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number});
+		\path[fill=\tikzpeople@hair\if@tikzpeople@saturated!80\else!50\fi,draw=\tikzpeople@hairshadow] 
+			(.39pt,0pt) ellipse 
+			(.39pt and .27pt +0.02*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number}); 
 		}
 	}] (25:2.7pt) to[out=320,in=80,out looseness=.5] (3.3pt,-3pt);
 }
 
 \newcommand{\tikzpeople@judge@paintrighthair}{
-	\fill[hairshadow] (10:3.05pt) arc (10:135:3.05pt) -- (-1pt,.4pt) to [out=60,in=160,out looseness=1.4] (.9pt,1pt) to [out=40,in=95,out looseness=1.4] (10:3.05pt);
+	\fill[hairshadow] 
+		(10:3.05pt) arc (10:135:3.05pt) -- (-1pt,.4pt) 
+		to[out=60,in=160,out looseness=1.4] (.9pt,1pt) 
+		to[out=40,in=95,out looseness=1.4] (10:3.05pt);
 	\path[decorate, decoration={markings,
-		mark=at position .165 with {\coordinate (judgelock1) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
-		mark=at position .330 with {\coordinate (judgelock2) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
-		mark=at position .495 with {\coordinate (judgelock3) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
-		mark=at position .660 with {\coordinate (judgelock4) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
-		mark=at position .825 with {\coordinate (judgelock5) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
+		mark=at position .165 with {\coordinate (tikzpeople@tmp1) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
+		mark=at position .330 with {\coordinate (tikzpeople@tmp2) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
+		mark=at position .495 with {\coordinate (tikzpeople@tmp3) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
+		mark=at position .660 with {\coordinate (tikzpeople@tmp4) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
+		mark=at position .825 with {\coordinate (tikzpeople@tmp5) at (0,\if@tikzpeople@mirrored -1*\fi\scalingfactor*.2pt);},
 	}] (150:3.1pt) to[out=240,in=120,in looseness=.3] (220:4.8pt);
 	\draw[hair,join=bevel, shading angle=-45, postaction={decorate},decoration={
 		markings,
@@ -92,13 +84,17 @@
 			\if@tikzpeople@mirrored
 				\pgftransformyscale{-1}
 			\fi
-			\fill[\tikzpeople@hairshadow] (-.06pt,0) to [out=70,in=190+2*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number},out looseness=.8] ++(46.5+2*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number}:3.7pt-.27pt*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number}) to [out=190+2*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number},in=70,in looseness=.8] (.05pt,0);
+			\fill[\tikzpeople@hairshadow] 
+				(-.06pt,0) to[out=70,in=190+2*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number},out looseness=.8] 
+				++(46.5+2*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number}:3.7pt-.27pt*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number}) 
+				to[out=190+2*\pgfkeysvalueof{/pgf/decoration/mark info/sequence number},in=70,in looseness=.8] (.05pt,0);
 			\path[fill=\tikzpeople@hairshadow] (.33pt,0pt) circle (.43pt); 
-			\path[fill=\tikzpeople@hair!50,draw=\tikzpeople@hairshadow] (.31pt,-.025pt) circle (.37pt); 
+			\path[fill=\tikzpeople@hair\if@tikzpeople@saturated!80\else!50\fi,draw=\tikzpeople@hairshadow]
+				(.31pt,-.025pt) circle (.37pt); 
 		}
-	}] (10:3pt) to[out=90,in=300] (30:3.1pt) arc (30:150:3.1pt) to[out=190,in=140] (judgelock1)
-		to[out=150,in=135] (judgelock2) to[out=155,in=140] (judgelock3) to[out=160,in=145] (judgelock4) 
-		to[out=165,in=150] (judgelock5)	to[out=170,in=120] (220:4.8pt) to [out=300,in=160,out looseness=1]	(260:4.8pt) 
+	}] (10:3pt) to[out=90,in=300] (30:3.1pt) arc (30:150:3.1pt) to[out=190,in=140] (tikzpeople@tmp1)
+		to[out=150,in=135] (tikzpeople@tmp2) to[out=155,in=140] (tikzpeople@tmp3) to[out=160,in=145] (tikzpeople@tmp4) 
+		to[out=165,in=150] (tikzpeople@tmp5)	to[out=170,in=120] (220:4.8pt) to [out=300,in=160,out looseness=1]	(260:4.8pt) 
 		to [out=100,in=260,out looseness=1] (-1pt,.6pt) to [out=80,in=160,out looseness=1.4] (.9pt,1.4pt) 
 		to [out=40,in=92,in looseness=1.1,out looseness=1.6] (10:3pt) -- cycle;
 }
@@ -106,12 +102,15 @@
 \newcommand{\tikzpeople@judge@paintundershirt}{
 	\begin{scope}
 		\draw[undershirt] (320:3pt) to[out=320,in=0, out looseness=1.5] (295:6.8pt)
-			to[out=290,in=310,looseness=1.3] ++(-1.1pt,-.7pt) to[out=250,in=300,looseness=1.4] ++(-1.2pt,-.2pt)
-			to[out=220,in=280,looseness=1.4] ++(-1.2pt,.3pt) to[out=220,in=260,looseness=1.4] ++(-1.1pt,.5pt)
+			to[out=290,in=310,looseness=1.3] ++(-1.1pt,-.7pt) 
+			to[out=250,in=300,looseness=1.4] ++(-1.2pt,-.2pt)
+			to[out=220,in=280,looseness=1.4] ++(-1.2pt,.3pt) 
+			to[out=220,in=260,looseness=1.4] ++(-1.1pt,.5pt)
 			to[out=190,in=230, in looseness=1.3] (235:3pt);
 	\end{scope}
 }
 
 \newcommand{\tikzpeople@judge@colors}{
-	shirt/200/{-1/-1},hair/160/{-.5/1.4},hairshadow/20/{.25/1.3}, skin/0/{.25/.4}, undershirt/180/{-.6/-.6}%
+	shirt/200/{-1/-1},hair/160/{-.5/1.4},hairshadow/20/{.25/1.3}, skin/0/{.25/.4}, 
+	undershirt/180/{-.6/-.6}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.maninblack.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.maninblack.sty
new file mode 100644
index 00000000000..d9e5136f9bb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.maninblack.sty
@@ -0,0 +1,119 @@
+%% Copyright 2016 Nils Fleischhacker
+%%
+%% This work may be distributed and/or modified under the 
+%% conditions of the LaTeX Project Public License, either 
+%% version 1.3 of this license or (at your option) any later 
+%% version. The latest version of this license is in
+%%
+%%   http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of 
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Nils Fleischhacker.
+\tikzpeople@addcolorkey{tie}
+\tikzpeople@addcolorkey{glasses}
+\tikzpeople@addcolorkey{earpiece}
+
+\newcommand{\tikzpeople@maninblack@paint}{
+	\tikzpeople@person@paintshirt
+	\tikzpeople@maninblack@paintundershirt
+	\tikzpeople@maninblack@paintopenshirt
+	\tikzpeople@person@paintrighthorn
+	\tikzpeople@person@painthead
+	\tikzpeople@person@painthair
+	\tikzpeople@maninblack@paintglasses
+	\tikzpeople@person@paintgoatee
+	\tikzpeople@person@paintlefthorn
+	\tikzpeople@person@painthalo
+}
+
+\newcommand{\tikzpeople@maninblack@definecolors}{
+	\definecolor{shirt}{rgb}{0,0,0}
+	\definecolor{undershirt}{rgb}{0.9,0.9,0.9}
+	\definecolor{tie}{rgb}{0,0,0}
+	\definecolor{hair}{rgb}{0,0,0}
+	\definecolor{earpiece}{rgb}{0.9,0.9,0.9}
+	\definecolor{glasses}{rgb}{0,0,.1}
+}
+
+\newcommand{\tikzpeople@maninblack@definestyles}{
+	\if@tikzpeople@saturated
+		\tikzset{
+			tie/.style          ={color=\tikzpeople@tie,top color=\tikzpeople@tie!70, bottom color=\tikzpeople@tie,shading angle=45},
+			glasses/.style      ={color=\tikzpeople@glasses,top color=\tikzpeople@glasses!70, bottom color=\tikzpeople@glasses,shading angle=45},
+			earpiece/.style     ={color=\tikzpeople@earpiece,top color=\tikzpeople@earpiece!70, bottom color=\tikzpeople@earpiece,shading angle=45},
+			earpiececable/.style={color=\tikzpeople@earpiece,decoration={coil,segment length=\scalingfactor*.12pt,amplitude=\scalingfactor*.1pt, pre length=\scalingfactor*.1pt},decorate,line width=\scalingfactor*.05pt}
+		}
+	\else
+		\tikzset{
+			tie/.style          ={color=\tikzpeople@tie!80,top color=\tikzpeople@tie!40, bottom color=\tikzpeople@tie!80,shading angle=45},
+			glasses/.style      ={color=\tikzpeople@glasses!90,top color=\tikzpeople@glasses!50, bottom color=\tikzpeople@glasses!90,shading angle=45},
+			earpiece/.style     ={color=\tikzpeople@earpiece!80,top color=\tikzpeople@earpiece!40, bottom color=\tikzpeople@earpiece!80,shading angle=45},
+			earpiececable/.style={color=\tikzpeople@earpiece!80,decoration={coil,segment length=\scalingfactor*.12pt,amplitude=\scalingfactor*.1pt, pre length=\scalingfactor*.1pt},decorate,line width=\scalingfactor*.05pt}
+		}
+	\fi
+}
+
+\newcommand{\tikzpeople@maninblack@paintglasses}{
+	\draw[glasses] 
+		(170:1.1pt) -- ++(173:1.8pt) -- ++(270:.1pt) to[out=340, in=140] (210:1pt);
+	\draw[glasses] 
+		(15:3pt) to[out=200,in=355] (170:1.1pt) to[out=280,in=180] ++(290:1.05pt) 
+		to[out=350,in=180,out looseness=3] (1.3pt,.1pt)  
+		to[out=0,in=180,in looseness=2] ++(310:1pt) to[out=0,in=230,in looseness=.5]
+		(357:3pt) arc (-3:15:3pt);
+	\begin{scope}
+		\clip (0pt,0pt) circle (3pt);
+		\draw[earpiececable] 
+			(190:2.1pt) ++(0,-.2pt) to[out=270,in=120] (240:3.2pt);
+		\draw[earpiece] (190:2.1pt) ellipse (.1pt and .2pt);
+	\end{scope}
+}
+
+\newcommand{\tikzpeople@maninblack@paintundershirt}{
+	\begin{scope}
+		\clip 
+			(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. 
+			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt,0pt) ..
+			(-4pt,-8pt);
+		\draw[undershirt]
+			(-2.2pt,-1pt) -- (2pt,-8.5pt) -- (2pt,-1pt);
+		\draw[tie]
+			(0pt,-2.5pt) -- (0.8pt,-3.2pt) -- (1.1pt,-6  pt) -- (1.7pt,-8.7pt) -- 
+			(2pt,-8.7pt) -- (2  pt,-5.5pt) -- (1  pt,-3.1pt) -- (1.2pt,-2  pt) -- 
+			(0.3pt,-2  pt);
+		\draw[undershirt,shading angle=-45]
+			(0.5pt,-3pt) -- (0.1pt,-3.7pt) -- (-1pt,-3pt);
+		\draw[undershirt,shading angle=-45] 
+			(0.9pt,-2.5pt) -- (1.8pt,-3.2pt) -- (2.2pt,-2.2pt);
+	\end{scope}
+}
+
+\newcommand{\tikzpeople@maninblack@paintopenshirt}{
+	\begin{scope}
+		\clip 
+			(-4pt,-8pt) .. controls (-2pt,-10pt) and (3pt,-9pt) .. 
+			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt,0pt) ..
+			(-4pt,-8pt);
+		\draw[shirt,shading angle=-45]
+			(-2pt,-2.6 pt)   -- (-1.5pt,-5pt)   -- (-0.5pt,-5pt) -- (-1.1pt,-5.2pt) -- 
+			(1.6pt,-8.75pt)  -- (1.9pt,-8.75pt) .. controls (1.7pt,-7pt) and 
+			(-0pt,-3.2pt)    .. (-1.6pt,-2pt)   -- cycle;
+		\draw[shirt,shading angle=-45]
+			(1.9pt,-2pt) .. controls (1.9pt,-1.8pt)	and (1.9pt,-8.5pt) .. 
+			(1.9pt,-8.75pt) -- (2.3pt,-8.5pt) -- (3.2pt,-5.2pt) -- 
+			(2.6pt,-5.2 pt) -- (3.2pt,-5  pt) -- (2.3pt,-2.3pt) -- cycle;
+	\end{scope}
+	\draw[color=\tikzpeople@shirt!80]
+		(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
+		( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) ..
+		(-4pt,-8pt);
+}
+
+\newcommand{\tikzpeople@maninblack@colors}{
+	shirt/210/{-1/-.75},hair/150/{-.4/1.3},skin/0/{.4/.5},earpiece/170/{-.68/.74},
+	undershirt/190/{0/-.2}, tie/330/{.32/-.7}, glasses/30/{.6/.9}%
+}
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.mexican.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.mexican.sty
index efec50d6398..590635cec4a 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.mexican.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.mexican.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{ringtop}
 \tikzpeople@addcolorkey{ringmid}
 \tikzpeople@addcolorkey{ringbot}
@@ -43,7 +27,6 @@
 }
 
 \newcommand{\tikzpeople@mexican@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{hair}{rgb}{0,0,0}
 	\definecolor{shirt}{rgb}{0,0.3,0}
 	\definecolor{ringtop}{rgb}{1,1,0}
@@ -53,15 +36,21 @@
 }
 
 \newcommand{\tikzpeople@mexican@definestyles}{
-	\tikzstyle{shirt}=[top color=\tikzpeople@shirt!60, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{ringtop}=[top color=\tikzpeople@ringtop!80, bottom color=\tikzpeople@ringtop,shading angle=45];
-	\tikzstyle{ringmid}=[top color=\tikzpeople@ringmid!80, bottom color=\tikzpeople@ringmid,shading angle=45];
-	\tikzstyle{ringbot}=[top color=\tikzpeople@ringbot!80, bottom color=\tikzpeople@ringbot,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{innerhat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!60, bottom color=\tikzpeople@hat,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			ringtop/.style ={top color=\tikzpeople@ringtop!80, bottom color=\tikzpeople@ringtop,shading angle=45},
+			ringmid/.style ={top color=\tikzpeople@ringmid!80, bottom color=\tikzpeople@ringmid,shading angle=45},
+			ringbot/.style ={top color=\tikzpeople@ringbot!80, bottom color=\tikzpeople@ringbot,shading angle=45},
+			innerhat/.style={color=\tikzpeople@hat,top color=\tikzpeople@hat!80, bottom color=\tikzpeople@hat,shading angle=45}
+		}
+	\else
+		\tikzset{
+			ringtop/.style ={top color=\tikzpeople@ringtop!80, bottom color=\tikzpeople@ringtop,shading angle=45},
+			ringmid/.style ={top color=\tikzpeople@ringmid!80, bottom color=\tikzpeople@ringmid,shading angle=45},
+			ringbot/.style ={top color=\tikzpeople@ringbot!80, bottom color=\tikzpeople@ringbot,shading angle=45},
+			innerhat/.style={color=\tikzpeople@hat!80,top color=\tikzpeople@hat!60, bottom color=\tikzpeople@hat,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@mexican@painthair}{
@@ -88,31 +77,32 @@
 }
 
 \newcommand{\tikzpeople@mexican@paintrings}{
-	\shade[ringtop]
-		(-3.4 pt,-4  pt) .. controls (-2.0pt,-6.0pt) and ( 3pt,-5  pt) .. 
-		( 3.85pt,-3.5pt) .. controls ( 3.6pt,-3.1pt) .. 
-		( 3.4 pt,-3  pt) .. controls ( 3  pt,-4.2pt) and (-2pt,-5.3pt) .. (-3pt,-3.4pt);
-	\draw[color=\tikzpeople@ringtop,dash pattern=on 0.08*\scalingfactor off 0.15*\scalingfactor,line width=0.08*\scalingfactor]
-		(-3.4 pt,-4.2pt) .. controls (-2pt,-6.2pt) and (3pt,-5.2pt) .. 
-		( 3.85pt,-3.7pt);
-	
-	\shade[ringmid]
-		(-3.9pt,-5.5pt) .. controls (-2   pt,-7.5pt) and (3pt,-6.5pt) .. 
-		(4.55pt,-4.7pt) .. controls ( 4.45pt,-4.3pt) .. 
-		(4.2 pt,-4  pt) .. controls ( 3   pt,-5.7pt) and (-2pt,-6.7pt) .. 
-		(-3.7pt,-4.8pt);
-	\draw [color=\tikzpeople@ringmid,dash pattern=on 0.08*\scalingfactor off 0.15*\scalingfactor,line width=0.08*\scalingfactor]
-		(-3.9pt,-5.7pt) .. controls (-2pt,-7.7pt) and (3pt,-6.7pt) .. (4.55pt, -4.9pt);
+	\begin{scope}
+		\clip (-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
+			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) ..
+			(-4pt,-8pt);
+		\shade[ringtop]
+			(-3.4 pt,-4pt) .. controls (-2.0pt,-6.0pt) and ( 3pt,-5  pt) .. 
+			( 3.85pt,-3.5pt) .. controls ( 3.6pt,-3.1pt) .. 
+			( 3.4 pt,-3  pt) .. controls ( 3  pt,-4.2pt) and (-2pt,-5.3pt) .. (-3pt,-3.4pt);
+		\draw[color=\tikzpeople@ringtop,dash pattern=on 0 off 0.2*\scalingfactor,line width=0.08*\scalingfactor,line cap=round]
+			(-3.4 pt,-4.2pt) .. controls (-2pt,-6.2pt) and (3pt,-5.2pt) .. 
+			( 3.85pt,-3.7pt);
 	
-	\shade [ringbot]
-		(-4   pt, -7 pt) .. controls (-2  pt,-9  pt) and ( 3pt,-8  pt) .. 
-		( 4.9 pt, -6 pt) .. controls ( 4.9pt,-5.8pt) .. 
-		( 4.75pt,-5.2pt) .. controls ( 3  pt,-7.2pt) and (-2pt,-8.2pt) .. 
-		(-4   pt,-6.2pt);
-	\draw [color=\tikzpeople@ringbot,dash pattern=on 0.08*\scalingfactor off 0.15*\scalingfactor,line width=0.08*\scalingfactor]
-		(-4pt,-7.2pt) .. controls (-2pt,-9.2pt) and (3pt,-8.2pt) .. (4.9pt, -6.2pt);
+		\shade[ringmid]
+			(-4pt,-5.4pt) .. controls (-2pt,-7.5pt) and (3pt,-6.5pt) .. 
+			(4.6pt,-4.65pt) -- (4.25 pt,-3.95pt) .. controls (3pt,-5.7pt) and 
+			(-2pt,-6.7pt) .. (-3.8pt,-4.7pt);
+		\draw [color=\tikzpeople@ringmid,dash pattern=on 0 off 0.2*\scalingfactor,line width=0.08*\scalingfactor,line cap=round]
+			(-4pt,-5.6pt) .. controls (-2pt,-7.7pt) and (3pt,-6.7pt) .. (4.6pt, -4.8pt);
 	
-	\draw[color=\tikzpeople@shirt!80]
+		\shade [ringbot]
+			(-4.1pt,-6.9pt) .. controls (-2pt,-9pt) and (3pt,-8pt) .. (5pt, -5.9pt) --
+			(4.8pt,-5.15pt) .. controls (3pt,-7.2pt) and (-2pt,-8.2pt) .. (-4.1pt,-6.1pt);
+		\draw [color=\tikzpeople@ringbot,dash pattern=on 0 off 0.2*\scalingfactor,line width=0.08*\scalingfactor,line cap=round]
+			(-4.1pt,-7.1pt) .. controls (-2pt,-9.2pt) and (3pt,-8.2pt) .. (5pt, -6.1pt);
+		\end{scope}
+	\draw[color=\tikzpeople@shirt\if@tikzpeople@saturated\else!80\fi]
 		(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
 		( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) ..
 		(-4pt,-8pt);
@@ -120,5 +110,5 @@
 
 \newcommand{\tikzpeople@mexican@colors}{
 	shirt/350/{.5/0}, hat/30/{1/1.25}, hair/150/{-1.1/.5}, skin/10/{.35/.5}, 
-	ringtop/170/{-.9/-.15}, ringmid/190/{-1/-.6}, ringbot/210/{-1.1/-1}%
+	ringtop/170/{-.9/-.25}, ringmid/190/{-1/-.7}, ringbot/210/{-1.1/-1.1}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nun.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nun.sty
index f8c74066c38..7898f816427 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nun.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nun.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{plaid}
 
 \newcommand{\tikzpeople@nun@paint}{
@@ -42,55 +26,60 @@
 }
 
 \newcommand{\tikzpeople@nun@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{shirt}{rgb}{0,0,0}
+	\definecolor{hat}{rgb}{0,0,0}
 	\definecolor{plaid}{RGB}{232,232,232}
 	\definecolor{hair}{rgb}{0,0,0}
 }
 
 \newcommand{\tikzpeople@nun@definestyles}{
-	\tikzstyle{shirt}=[clip, top color=\tikzpeople@shirt!60, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{plaid}=[top color=\tikzpeople@plaid!30, bottom color=\tikzpeople@plaid!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40,bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			plaid/.style={top color=\tikzpeople@plaid!70, bottom color=\tikzpeople@plaid,shading angle=45}
+		}
+	\else
+		\tikzset{
+			plaid/.style={top color=\tikzpeople@plaid!30, bottom color=\tikzpeople@plaid!90,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@nun@painthat}{
 	\begin{scope}
 		\clip(0,0) circle (3.05pt);
-		\fill[color=\tikzpeople@plaid!80!black!30]
+		\path[plaid,draw=none]
 			( -1.3pt, -0.1pt) .. controls (0pt,-0.1pt) and (2pt,0.2pt) .. 
-			(10:3.2pt) arc (10:180:3.2pt);
+			(10:3.2pt) arc (10:180:3.2pt) -- cycle;
 	\end{scope}
 	\draw[hat]
-		(15:3pt) arc (15:170:3pt) --
-		(-3.0pt, 0.2pt) .. controls (-3.3pt,-1.0pt) and (-3.3pt,-2.3pt) ..
+		(15:3.05pt) arc (15:170:3.05pt) --
+		(-3.05pt, 0.2pt) .. controls (-3.3pt,-1.0pt) and (-3.3pt,-2.3pt) ..
 		(-3.2pt,-3.6pt) .. controls (-2.7pt,-4.0pt) and (-1.7pt,-4.3pt) .. 
 		(-1.2pt,-4.5pt) .. controls (-1.6pt,-2.0pt) and (-1.6pt, 0.0pt) .. 
-		(-1.3pt, 0.2pt) .. controls ( 0.0pt, 0.2pt) and ( 2.0pt, 0.5pt) .. 
-		(15:3pt);
+		(-1.3pt, 0.2pt) .. controls ( 0.0pt, 0.1pt) and ( 2.0pt, 0.5pt) .. 
+		(15:3.05pt);
 }
 
 \newcommand{\tikzpeople@nun@paintshirt}{
 	\begin{scope}
+		\clip
+			(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
+			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) ..
+			(-4pt,-8pt);
 		\path[shirt]
 			(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
 			( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) ..
 			(-4pt,-8pt);
 		\path[plaid]
-			(-3.9 pt, 0.0pt) -- (-3.9pt,-5.5pt) .. controls (-2pt,-7.5pt) and (3pt,-6.5pt) .. 
-			( 4.55pt,-4.7pt) .. controls (4.45pt,-4.3pt) .. 
+			(-3.9 pt, 0.0pt) -- (-3.9pt,-5.5pt) .. controls (-2pt,-7.5pt) and 
+			(3pt,-6.5pt) .. ( 4.55pt,-4.7pt) .. controls (4.45pt,-4.3pt) .. 
 			( 4.2 pt,-4.0pt) -- (4.2pt,0pt);
 	\end{scope}
-	\draw[color=\tikzpeople@shirt!80]
-		(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
-		( 5pt,-7pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) ..
-		(-4pt,-8pt);
+	\draw[color=\tikzpeople@shirt\if@tikzpeople@saturated\else!80\fi]
+		(-4pt,-8pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. ( 5pt,-7pt) .. 
+		controls ( 5pt,  0pt) and (-5pt, 0pt) .. (-4pt,-8pt);
 }
 
 \newcommand{\tikzpeople@nun@colors}{
-	shirt/180/{-1/-1.2,-.65/.7},	skin/20/{.6/.9}, plaid/340/{.9/-.4,.1/.96}%
+	shirt/190/{-1/-1.2}, hat/170/{-.65/.7},	skin/20/{.6/.9}, plaid/340/{.9/-.4,.1/.9}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nurse.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nurse.sty
index f77b69a36a0..4d0fff06a6d 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nurse.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.nurse.sty
@@ -13,25 +13,11 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{badge}
 \tikzpeople@addcolorkey{badgeclip}
 \tikzpeople@addcolorkey{badgename}
 \tikzpeople@addcolorkey{redcross}
+\tikzpeople@addtextkey{badgetext}{Nurse}
 
 \newcommand{\tikzpeople@nurse@paint}{
 	\tikzpeople@person@paintshirt
@@ -58,10 +44,10 @@
 			(180:360:1.2pt) --cycle;
 		\draw[color=\tikzpeople@shirt!90!black,thick] 
 			(-.1pt,-7.2pt) to[out=204,in=348] (-2.5pt,-7.2pt);
-		\draw[fill=\tikzpeople@badge,draw=\tikzpeople@badge!30!black] 
+		\draw[badge] 
 			(-.4pt,-7.6pt) to[out=185,in=355] (-2.1pt,-7.6pt) -- ++(270:.7pt) 
 			to[out=355,in=185] (-.4pt,-8.3pt) --cycle;
-		\draw[top color=\tikzpeople@badgeclip!30, bottom color=\tikzpeople@badgeclip,shading angle=45,rounded corners=.08*\scalingfactor] 
+		\draw[badgeclip] 
 			(-1.1pt,-7.3pt) rectangle ++(-.2pt,-.4pt);
 		\draw[draw=\tikzpeople@redcross,fill=\tikzpeople@redcross] 
 			(-1.8pt,-7.8pt) -- ++(0pt,-.1pt) -- ++(-.1pt,0pt) -- ++(0pt,-.1pt) -- 
@@ -69,14 +55,13 @@
 			++(.1pt,0pt) -- ++(0pt,.1pt) -- ++(-.1pt,0pt) -- ++(0pt,.1pt) --cycle;
 		{
 			\pgf@xa=0.6pt*\scalingfactor
-			\pgftext[at=\pgfpoint{-1pt}{-7.95pt}]{\resizebox{\pgf@xa}{!}{\color{\tikzpeople@badgename}\if@tikzpeople@mirrored\reflectbox{Nurse}\else{Nurse}\fi}}
+			\pgftext[at=\pgfpoint{-1pt}{-7.95pt}]{\resizebox{\pgf@xa}{!}{\color{\tikzpeople@badgename}\if@tikzpeople@mirrored\reflectbox{\tikzpeople@badgetext}\else{\tikzpeople@badgetext}\fi}}
 		}
 	\end{scope}
 }
 
 \newcommand{\tikzpeople@nurse@definecolors}{
 	\definecolor{shirt}{RGB}{237,113,102}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{badgename}{rgb}{0,0,0}
 	\definecolor{badge}{rgb}{1,1,1}
 	\definecolor{badgeclip}{rgb}{0.4,0.4,0.4}
@@ -84,16 +69,21 @@
 	\definecolor{hair}{rgb}{0,0,0}
 }
 \newcommand{\tikzpeople@nurse@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!30, bottom color=\tikzpeople@shirt!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			badge/.style={fill=\tikzpeople@badge,draw=\tikzpeople@badge!30!black},
+			badgeclip/.style={top color=\tikzpeople@badgeclip!70, bottom color=\tikzpeople@badgeclip,shading angle=45,rounded corners=.08*\scalingfactor}
+		}
+	\else
+		\tikzset{
+			badge/.style={fill=\tikzpeople@badge,draw=\tikzpeople@badge!30!black},
+			badgeclip/.style={top color=\tikzpeople@badgeclip!30, bottom color=\tikzpeople@badgeclip,shading angle=45,rounded corners=.08*\scalingfactor}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@nurse@colors}{
-	shirt/0/{.9/-.35}, hair/150/{-.75/.9}, badgeclip/170/{-.425/-1.15}, 
-	redcross/190/{-.55/-1.3}, badge/210/{-.4/-1.35}, badgename/340/{-.3/-1.3}, 
+	shirt/0/{.9/-.35}, hair/150/{-.75/.9}, badgeclip/170/{-.45/-1.2}, 
+	redcross/190/{-.6/-1.35}, badge/210/{-.5/-1.4}, badgename/340/{-.4/-1.35}, 
 	skin/20/{.6/.6}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.physician.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.physician.sty
index dc982370914..dbcbc50030f 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.physician.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.physician.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{stethoscope}
 \tikzpeople@addcolorkey{tube}
 
@@ -77,19 +61,19 @@
 		+(323:.8pt) .. ++(197:1.7pt);
 	\draw[stethoscope]
 		(234:2.9pt) to[out=270,in=135] ++(295:1.3pt) to[out=315,in=143] 
-		++(323:1.8pt) coordinate (tmp) -- ++(233:.3pt) to[in=315,out=143] 
+		++(323:1.8pt) coordinate (tikzpeople@tmp) -- ++(233:.3pt) to[in=315,out=143] 
 		++(143:1.9pt) to[in=270,out=135] ++(110:2pt);
 	\draw[stethoscope] 
-		(tmp) ++(0,.06pt) coordinate (tmp2) to[out=225,in=61] ++(233:.4pt) -- 
-		++(323:.5pt) coordinate (tmp) to[in=241,out=45] ++(53:.4pt) (tmp) 
-		to[in=225,out=61] ++(53:.4pt) --(tmp2);
+		(tikzpeople@tmp) ++(0,.06pt) coordinate (tikzpeople@tmp2) to[out=225,in=61] ++(233:.4pt) -- 
+		++(323:.5pt) coordinate (tikzpeople@tmp) to[in=241,out=45] ++(53:.4pt) (tikzpeople@tmp) 
+		to[in=225,out=61] ++(53:.4pt) --(tikzpeople@tmp2);
 	\draw[stethoscope] 
 		(314:2.9pt) to[out=308,in=87] ++(307:.4pt) to[out=273,in=80] ++(263:1.6pt) 
-		coordinate (tmp) -- ++(353:.3pt) to[in=273,out=80] ++(83:1.7pt) 
+		coordinate (tikzpeople@tmp) -- ++(353:.3pt) to[in=273,out=80] ++(83:1.7pt) 
 		to[in=270,out=93] ++(120:.7pt);
 	\draw[stethoscope] 
-		(tmp) ++(-.04pt,.06pt) coordinate (tmp2) to[out=358,in=162] ++(350:.4pt) -- 
-		++(260:.5pt) coordinate (tmp) to[in=358,out=162] ++(170:.4pt) --(tmp2);
+		(tikzpeople@tmp) ++(-.04pt,.06pt) coordinate (tikzpeople@tmp2) to[out=358,in=162] ++(350:.4pt) -- 
+		++(260:.5pt) coordinate (tikzpeople@tmp) to[in=358,out=162] ++(170:.4pt) --(tikzpeople@tmp2);
 }
 
 \newcommand{\tikzpeople@physician@definecolors}{
@@ -97,24 +81,24 @@
 	\definecolor{hat}{RGB}{150,176,228}
 	\definecolor{stethoscope}{RGB}{149,153,164}
 	\definecolor{tube}{RGB}{193,75,26}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{hair}{rgb}{0,0,0}
 }
 
 \newcommand{\tikzpeople@physician@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!30, bottom color=\tikzpeople@shirt!90,shading angle=45];
-	\tikzstyle{mask}=[color=\tikzpeople@mask!98!black,top color=\tikzpeople@mask!30, bottom color=\tikzpeople@mask!90,shading angle=90];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!98!black,top color=\tikzpeople@hat!30, bottom color=\tikzpeople@hat!90,shading angle=90];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{tube}=[color=\tikzpeople@tube!80,top color=\tikzpeople@tube!40, bottom color=\tikzpeople@tube!80,shading angle=45];
-	\tikzstyle{stethoscope}=[color=\tikzpeople@stethoscope!80,top color=\tikzpeople@stethoscope!40, bottom color=\tikzpeople@stethoscope!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			tube/.style={color=\tikzpeople@tube,top color=\tikzpeople@tube!70, bottom color=\tikzpeople@tube,shading angle=45},
+			stethoscope/.style={color=\tikzpeople@stethoscope,top color=\tikzpeople@stethoscope!70, bottom color=\tikzpeople@stethoscope,shading angle=45}
+		}
+	\else
+		\tikzset{
+			tube/.style={color=\tikzpeople@tube!80,top color=\tikzpeople@tube!40, bottom color=\tikzpeople@tube!80,shading angle=45},
+			stethoscope/.style={color=\tikzpeople@stethoscope!80,top color=\tikzpeople@stethoscope!40, bottom color=\tikzpeople@stethoscope!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@physician@colors}{
 	shirt/340/{1/-.75}, hair/160/{-.75/.9}, hat/20/{.5/1.3}, 
-	stethoscope/180/{-.35/-.15}, tube/200/{-.2/-1.2}, skin/0/{.3/.6}%
+	stethoscope/180/{-.48/-.15}, tube/200/{-.25/-1.2}, skin/0/{.3/.6}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.pilot.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.pilot.sty
index d46af1fec55..80213e9c29b 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.pilot.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.pilot.sty
@@ -13,24 +13,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
-\tikzpeople@addcolorkey{undershirt}
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{visor}
 \tikzpeople@addcolorkey{straps}
 
@@ -75,14 +58,15 @@
 }
 
 \newcommand{\tikzpeople@pilot@paintvisor}{
-	\pgfdeclareradialshading{visor}{\pgfqpoint{-15pt}{10pt}}{%
-		color(0pt)=(\tikzpeople@visor!20);
-		color(40pt)=(\tikzpeople@visor!80)}
-	\draw[visor,rounded corners=.4pt*\scalingfactor] (155:2.5pt) to [out=40,in=170] (45:3.2pt) to [out=310,in=90] (2:3.2pt) -- (348:2pt) -- (40:1.3pt) -- (300:.5pt) -- (200:1.5pt) -- cycle;
+	\draw[visor,rounded corners=.4pt*\scalingfactor] 
+		(155:2.5pt) to [out=40,in=170] (45:3.2pt) to [out=310,in=90] (2:3.2pt) -- 
+		(348:2pt) -- (40:1.3pt) -- (300:.5pt) -- (200:1.5pt) -- cycle;
 }
 
 \newcommand{\tikzpeople@pilot@painthat}{
-	\draw[hat] (5:3pt) arc (5:255:3pt) to [out=120,in=250] ++(-0.1pt,2.7pt) to [out=350,in=210] (5:3pt);
+	\draw[hat] 
+		(5:3pt) arc (5:255:3pt) to [out=120,in=250] ++(-0.1pt,2.7pt) 
+		to[out=350,in=210] (5:3pt);
 }
 
 \newcommand{\tikzpeople@pilot@definecolors}{
@@ -90,27 +74,33 @@
 	\definecolor{hat}{RGB}{232,232,232}
 	\definecolor{visor}{RGB}{122,150,165}
 	\definecolor{undershirt}{RGB}{99,97,96}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{straps}{rgb}{0,0,0}
 	\definecolor{details}{rgb}{0.3,0.3,0.3}
 }
 
 \newcommand{\tikzpeople@pilot@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{visor}=[shading=visor,color=\tikzpeople@visor!80];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!30, bottom color=\tikzpeople@hat!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{details}=[color=\tikzpeople@details!80];
-	\tikzstyle{straps}=[color=\tikzpeople@straps!60,top color=\tikzpeople@straps!5, bottom color=\tikzpeople@straps!20,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\pgfdeclareradialshading{visor}{\pgfqpoint{-15pt}{10pt}}{%
+			color(0pt)=(\tikzpeople@visor!30);
+			color(40pt)=(\tikzpeople@visor)}
+		\tikzset{
+			visor/.style  ={shading=visor,color=\tikzpeople@visor},
+			details/.style={color=\tikzpeople@details},
+			straps/.style ={color=\tikzpeople@straps,top color=\tikzpeople@straps!20, bottom color=\tikzpeople@straps!50,shading angle=45}
+		}
+	\else
+		\pgfdeclareradialshading{visor}{\pgfqpoint{-15pt}{10pt}}{%
+			color(0pt)=(\tikzpeople@visor!20);
+			color(40pt)=(\tikzpeople@visor!80)}
+		\tikzset{
+			visor/.style  ={shading=visor,color=\tikzpeople@visor!80},
+			details/.style={color=\tikzpeople@details!80},
+			straps/.style ={color=\tikzpeople@straps!60,top color=\tikzpeople@straps!5, bottom color=\tikzpeople@straps!20,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@pilot@colors}{
 	shirt/200/{-1/-.95}, visor/30/{.7/1.1}, hat/160/{-.75/.9}, skin/10/{.5/.6}, 
-	undershirt/180/{.15/-.1},  straps/350/{.8/-.5},  decoration/330/{.42/-.7}%
+	undershirt/180/{.15/-.1},  straps/350/{.8/-.5},  decoration/330/{.35/-.7}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.police.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.police.sty
index 0b1e50ab20c..40534b1dfec 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.police.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.police.sty
@@ -13,23 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{undershirt}
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{hatshield}
 \tikzpeople@addcolorkey{hatbadge}
 \tikzpeople@addcolorkey{badge}
@@ -71,9 +54,9 @@
 }
 
 \newcommand{\tikzpeople@police@painthat}{
-	\path (160:3pt) arc (-180:-120:2.85pt and 1pt) coordinate (blablub);
+	\path (160:3pt) arc (-180:-120:2.85pt and 1pt) coordinate (tikzpeople@tmp);
 	\draw[hatbottom,rounded corners=.75pt] 
-		(blablub) -- ++(340:1.5pt) .. controls ++(340:1pt) .. ++(10:3.8pt) .. 
+		(tikzpeople@tmp) -- ++(340:1.5pt) .. controls ++(340:1pt) .. ++(10:3.8pt) .. 
 		controls ++(45:.2pt) .. (20:3pt);
 	\draw[hatbottom] 
 		(160:3pt) ++(0pt,1pt) -- (160:3pt) arc (-180:0:2.85pt and 1pt) -- 
@@ -93,16 +76,14 @@
 			(hatbadge) .. controls ++(335:1.2pt) .. ++(10:2.5pt) -- ++(0pt,-2pt);
 	\end{scope}
 	\draw[hatbadge] 
-		(hatbadge) ++(0.2pt,-0.2pt) coordinate (begin) .. controls ++(190:.5pt) .. 
+		(hatbadge) ++(0.2pt,-0.2pt) coordinate (tikzpeople@tmp) .. controls ++(190:.5pt) .. 
 		++(200:.75pt) .. controls ++(270:.75pt) .. ++(300:1pt) .. controls 
-		++(70:.5pt) .. ++(55:1.1pt) .. controls ++(135:.3pt) .. (begin);
+		++(70:.5pt) .. ++(55:1.1pt) .. controls ++(135:.3pt) .. (tikzpeople@tmp);
 }
 
 \newcommand{\tikzpeople@police@definecolors}{
 	\definecolor{shirt}{rgb}{0.18,0.38,0.80}
 	\definecolor{hat}{rgb}{0.18,0.38,0.80}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{badge}{rgb}{0.96,0.55,0.1}
 	\definecolor{hatbadge}{rgb}{0.82,0.82,0.82}
 	\definecolor{hatshield}{rgb}{0.031,0.09,0.19}
@@ -110,18 +91,23 @@
 }
 
 \newcommand{\tikzpeople@police@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!80, bottom color=\tikzpeople@shirt,shading angle=45];
-	\tikzstyle{hattop}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!80, bottom color=\tikzpeople@hat,shading angle=45];
-	\tikzstyle{hatbottom}=[color=\tikzpeople@hatshield!80,top color=\tikzpeople@hatshield!60, bottom color=\tikzpeople@hatshield!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{badge}=[color=\tikzpeople@badge!80,top color=\tikzpeople@badge!40, bottom color=\tikzpeople@badge!80,shading angle=45];
-	\tikzstyle{hatbadge}=[color=\tikzpeople@hatbadge!80,top color=\tikzpeople@hatbadge!40!black!5, bottom color=\tikzpeople@hatbadge!80,shading angle=45];
-	\tikzstyle{hatshield}=[color=\tikzpeople@hatshield!80,top color=\tikzpeople@hatshield!40, bottom color=\tikzpeople@hatshield!80,shading angle=45];
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!30, bottom color=\tikzpeople@undershirt!90,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			shirt/.style    ={color=\tikzpeople@shirt!90,top color=\tikzpeople@shirt!90, bottom color=\tikzpeople@shirt,shading angle=45},
+			hattop/.style   ={color=\tikzpeople@hat!90,top color=\tikzpeople@hat!90, bottom color=\tikzpeople@hat,shading angle=45},
+			hatbottom/.style={color=\tikzpeople@hatshield,top color=\tikzpeople@hatshield!80, bottom color=\tikzpeople@hatshield,shading angle=45},
+			badge/.style    ={color=\tikzpeople@badge,top color=\tikzpeople@badge!70, bottom color=\tikzpeople@badge,shading angle=45},
+			hatbadge/.style ={color=\tikzpeople@hatbadge,top color=\tikzpeople@hatbadge!70, bottom color=\tikzpeople@hatbadge,shading angle=45}
+		}
+	\else
+		\tikzset{
+			shirt/.style    ={color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!80, bottom color=\tikzpeople@shirt,shading angle=45},
+			hattop/.style   ={color=\tikzpeople@hat!80,top color=\tikzpeople@hat!80, bottom color=\tikzpeople@hat,shading angle=45},
+			hatbottom/.style={color=\tikzpeople@hatshield!80,top color=\tikzpeople@hatshield!60, bottom color=\tikzpeople@hatshield!90,shading angle=45},
+			badge/.style    ={color=\tikzpeople@badge!80,top color=\tikzpeople@badge!40, bottom color=\tikzpeople@badge!80,shading angle=45},
+			hatbadge/.style ={color=\tikzpeople@hatbadge!80,top color=\tikzpeople@hatbadge!40, bottom color=\tikzpeople@hatbadge!80,shading angle=45}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@police@colors}{
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.priest.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.priest.sty
index abf13237d9d..ddf2c19d0cb 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.priest.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.priest.sty
@@ -13,24 +13,8 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{collar}
 \tikzpeople@addcolorkey{cross}
-\tikzpeople@addcolorkey{hat}
 
 \newcommand{\tikzpeople@priest@paint}{
 	\tikzpeople@person@paintshirt
@@ -55,16 +39,11 @@
 }
 
 \newcommand{\tikzpeople@priest@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45]
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45]
-	\tikzstyle{collar}=[color=\tikzpeople@collar!80,top color=\tikzpeople@collar!30, bottom color=\tikzpeople@collar!90,shading angle=45]
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{cross}=[color=\tikzpeople@cross, top color=\tikzpeople@cross!80, bottom color=\tikzpeople@cross,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{necklace}=[color=\tikzpeople@cross,dash pattern=on 0.15*\scalingfactor off 0.2*\scalingfactor,line width=0.15*\scalingfactor];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\tikzset{
+		collar/.style  ={color=\tikzpeople@collar!80,top color=\tikzpeople@collar!30, bottom color=\tikzpeople@collar!90,shading angle=45},
+		cross/.style   ={color=\tikzpeople@cross, top color=\tikzpeople@cross!80, bottom color=\tikzpeople@cross,shading angle=45},
+		necklace/.style={color=\tikzpeople@cross,dash pattern=on 0.1*\scalingfactor off 0.3*\scalingfactor,line width=0.15*\scalingfactor,cap=round}
+	}
 }
 
 \newcommand{\tikzpeople@priest@painthat}{
@@ -91,16 +70,14 @@
 			(0.6pt,-6.3pt) -- (0.6pt,-7.2pt);
 	}
 	\begin{scope}
-		\clip 
+		\clip
 			(-4.0pt,-8.0pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
 			( 5.0pt,-7.0pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) .. 
 			(-4.0pt,-8.0pt);
-		\draw[necklace] 
-			(-2.6pt,-2.9pt) .. controls (-1.8pt,-4.0pt) and (1.1pt,-5.2pt) .. 
-			(1.5pt,-5.3pt);
-		\draw[necklace] 
-			( 1.9pt,-5.3pt) .. controls ( 2.1pt,-4.9pt) and (2.8pt,-3.5pt) .. 
-			(2.9pt,-2.6pt);
+		\draw[necklace] (1.5pt,-5.3pt) .. controls (1.1pt,-5.2pt) and 
+			(-1.8pt,-4.0pt) .. (-2.6pt,-2.9pt);
+		\draw[necklace] ( 1.9pt,-5.3pt) .. controls ( 2.1pt,-4.9pt) and 
+			(2.8pt,-3.5pt) .. (2.9pt,-2.6pt);
 	\end{scope}
 }
 
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.sailor.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.sailor.sty
index 49c9a9750e6..415e6883327 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.sailor.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.sailor.sty
@@ -13,25 +13,8 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
 \tikzpeople@addcolorkey{stripes}
-\tikzpeople@addcolorkey{undershirt}
-\tikzpeople@addcolorkey{hat}
 
 \newcommand{\tikzpeople@sailor@paint}{
 	\tikzpeople@person@paintshirt
@@ -50,7 +33,7 @@
 	\begin{scope}
 		\clip (233:3pt) -- (1.5pt,-6.5pt) -- (312:3pt) -- cycle;
 		\draw[undershirt] (233:3.1pt) -- (1.5pt,-6.5pt) -- (312:3.1pt) -- cycle;
-		\draw[stripes,line width=0.15*\scalingfactor] (-0.5pt,-4pt) arc (270:300:6pt)
+		\draw[stripes] (-0.5pt,-4pt) arc (270:300:6pt)
 			(-0.5pt,-4.7pt) arc (270:300:6pt) (-0.5pt,-5.4pt) arc (270:300:6pt)
 			(-0.5pt,-6.1pt) arc (270:300:6pt);
 		\draw[skin] (200:3.5pt) arc (200:330:3.5pt);
@@ -112,25 +95,24 @@
 	\definecolor{hat}{RGB}{232,232,232}
 	\definecolor{undershirt}{rgb}{0.9,0.9,0.95}
 	\definecolor{stripes}{rgb}{0.3,0.3,0.3}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 	\definecolor{details}{rgb}{0.02,0.18,0.54}
 }
 
 \newcommand{\tikzpeople@sailor@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!30, bottom color=\tikzpeople@shirt!90,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!30, bottom color=\tikzpeople@hat!90,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{undershirt}=[color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45];
-	\tikzstyle{details}=[color=\tikzpeople@details!80,top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80,shading angle=45];
-	\tikzstyle{stripes}=[color=\tikzpeople@stripes!80];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			details/.style={color=\tikzpeople@details,top color=\tikzpeople@details!70, bottom color=\tikzpeople@details,shading angle=45},
+			stripes/.style={color=\tikzpeople@stripes,line width=0.15*\scalingfactor,cap=rect}
+		}
+	\else
+		\tikzset{
+			details/.style={color=\tikzpeople@details!80,top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80,shading angle=45},
+			stripes/.style={color=\tikzpeople@stripes!80,line width=0.15*\scalingfactor,cap=rect}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@sailor@colors}{
 	shirt/340/{1.2/-.9}, hair/170/{-.75/.9}, hat/150/{-.6/1.4}, skin/190/{-.6/.4},
-	undershirt/210/{.2/-.44}, stripes/0/{.3/-.5}, details/20/{0/1.8,.6/0}%
+	undershirt/210/{.2/-.5}, stripes/0/{.2/-.58}, details/20/{0/1.8,.6/0}%
 }
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.santa.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.santa.sty
index 53142c99895..ad3ea6e84f0 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.santa.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.santa.sty
@@ -13,24 +13,8 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
 \tikzpeople@addcolorkey{beard}
-\tikzpeople@addcolorkey{hat}
 
 \newcommand{\tikzpeople@santa@paint}{
 	\tikzpeople@person@paintshirt
@@ -44,7 +28,6 @@
 }
 
 \newcommand{\tikzpeople@santa@definecolors}{
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{shirt}{rgb}{0.98,0.01,0.01}
 	\definecolor{hat}{rgb}{0.98,0.01,0.01}
 	\definecolor{details}{RGB}{232,232,232}
@@ -52,13 +35,18 @@
 }
 
 \newcommand{\tikzpeople@santa@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45]
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45]
-	\tikzstyle{details}=[color=\tikzpeople@details!80,top color=\tikzpeople@details!30, bottom color=\tikzpeople@details!90,shading angle=45]
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{beard}=[color=\tikzpeople@beard!80, top color=\tikzpeople@beard!30, bottom color=\tikzpeople@beard!90,shading angle=45];
-	\tikzstyle{hair}=[beard];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			details/.style={color=\tikzpeople@details,top color=\tikzpeople@details!60, bottom color=\tikzpeople@details,shading angle=45},
+			beard/.style  ={color=\tikzpeople@beard, top color=\tikzpeople@beard!60, bottom color=\tikzpeople@beard,shading angle=45}
+		}
+	\else
+		\tikzset{
+			details/.style={color=\tikzpeople@details!80,top color=\tikzpeople@details!30, bottom color=\tikzpeople@details!90,shading angle=45},
+			beard/.style  ={color=\tikzpeople@beard!80, top color=\tikzpeople@beard!30, bottom color=\tikzpeople@beard!90,shading angle=45}
+		}
+	\fi
+	\tikzset{hair/.style=beard};
 }
 
 \newcommand{\tikzpeople@santa@painthat}{
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.surgeon.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.surgeon.sty
index e4f51479879..da25c6758bf 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.surgeon.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.surgeon.sty
@@ -13,22 +13,6 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{mask}
 
 \newcommand{\tikzpeople@surgeon@paint}{
@@ -72,19 +56,18 @@
 	\definecolor{shirt}{RGB}{171,201,177}
 	\definecolor{hat}{RGB}{171,201,177}
 	\definecolor{mask}{RGB}{171,201,177}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
-	\definecolor{hair}{rgb}{0.45,0.24,0}
 }
 
 \newcommand{\tikzpeople@surgeon@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!30, bottom color=\tikzpeople@shirt!90,shading angle=45];
-	\tikzstyle{mask}=[color=\tikzpeople@mask!98!black,top color=\tikzpeople@mask!30, bottom color=\tikzpeople@mask!90,shading angle=90];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!98!black,top color=\tikzpeople@hat!30, bottom color=\tikzpeople@hat!90,shading angle=90];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+	\if@tikzpeople@saturated
+		\tikzset{
+			mask/.style={color=\tikzpeople@mask,top color=\tikzpeople@mask!70, bottom color=\tikzpeople@mask,shading angle=90}
+		}
+	\else
+		\tikzset{
+			mask/.style={color=\tikzpeople@mask!80,top color=\tikzpeople@mask!40, bottom color=\tikzpeople@mask!80,shading angle=90}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@surgeon@colors}{
diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.sty
index 15bb6fff098..2be974ed749 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.sty
@@ -15,21 +15,23 @@
 %% The Current Maintainer of this work is Nils Fleischhacker.
 %%
 %% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
+%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty,
 %% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
 %% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
 %% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
 %% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
+%% tikzpeople.shape.dave.sty, tikzpeople.shape.devil.sty,
+%% tikzpeople.shape.duck.sty, tikzpeople.shape.graduate.sty,
+%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty,
 %% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
+%% tikzpeople.shape.maninblack.sty, tikzpeople.shape.mexican.sty,
+%% tikzpeople.shape.nun.sty, tikzpeople.shape.nurse.sty,
+%% tikzpeople.shape.physician.sty, tikzpeople.shape.pilot.sty,
+%% tikzpeople.shape.police.sty, tikzpeople.shape.priest.sty,
+%% tikzpeople.shape.sailor.sty, tikzpeople.shape.santa.sty,
+%% tikzpeople.shape.surgeon.sty
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tikzpeople}[2016/11/03 v0.2 People shaped nodes for Tikz]
+\ProvidesPackage{tikzpeople}[2016/11/28 v0.3 People shaped nodes for Tikz]
 
 \RequirePackage{tikz}
 \RequirePackage{calc}
@@ -47,9 +49,13 @@
 \DeclareOption{nobeards}{
   \@tikzpeople@nobeardstrue
 }
+\newif\if@tikzpeople@saturated\@tikzpeople@saturatedfalse
+\DeclareOption{saturated}{
+  \@tikzpeople@saturatedtrue
+}
 \ProcessOptions\relax
 \usepgflibrary{intersections}
-\usetikzlibrary{decorations.markings,decorations.pathmorphing,calc,positioning}
+\usetikzlibrary{decorations.markings,decorations.pathmorphing,calc,positioning,arrows.meta}
 
 \newif\if@tikzpeople@mirrored
 \pgfkeys{/tikz/mirrored/.is if=@tikzpeople@mirrored}
@@ -61,16 +67,37 @@
 \pgfkeys{/tikz/good/.is if=@tikzpeople@good}
 \newif\if@tikzpeople@monitor
 \pgfkeys{/tikz/monitor/.is if=@tikzpeople@monitor}
+\newif\if@tikzpeople@shield
+\pgfkeys{/tikz/shield/.is if=@tikzpeople@shield}
+\newif\if@tikzpeople@sword
+\pgfkeys{/tikz/sword/.is if=@tikzpeople@sword}
+\pgfkeys{/tikz/saturated/.is if=@tikzpeople@saturated}
 
 \newcommand{\tikzpeople@addcolorkey}[1]{
 	\expandafter\def\csname tikzpeople@#1\endcsname{#1}
 	\pgfkeys{/tikz/#1/.code=\expandafter\def\csname tikzpeople@#1\endcsname{##1}}
 }
 
+\newcommand{\tikzpeople@addtextkey}[2]{
+	\expandafter\def\csname tikzpeople@#1\endcsname{#2}
+	\pgfkeys{/tikz/#1/.code=\expandafter\def\csname tikzpeople@#1\endcsname{##1}}
+}
+
+\tikzpeople@addcolorkey{horns}
+\tikzpeople@addcolorkey{halo}
 \tikzpeople@addcolorkey{shirt}
+\tikzpeople@addcolorkey{undershirt}
 \tikzpeople@addcolorkey{skin}
 \tikzpeople@addcolorkey{hair}
+\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{pc}
+\tikzpeople@addcolorkey{shieldmid}
+\tikzpeople@addcolorkey{shieldedge}
+\tikzpeople@addcolorkey{shieldrivets}
+\tikzpeople@addcolorkey{swordblade}
+\tikzpeople@addcolorkey{swordgrip}
+\tikzpeople@addcolorkey{swordguard}
+\tikzpeople@addcolorkey{swordpommel}
 
 \pgfdeclareshape{person}{
 	\saveddimen{\scalingfactor}{
@@ -188,12 +215,18 @@
 			\tikzpeople@person@paintgoatee
 			\tikzpeople@person@paintlefthorn
 			\tikzpeople@person@painthalo
+			\if@tikzpeople@shield
+				\tikzpeople@person@paintshield
+			\fi
+			\if@tikzpeople@sword
+				\tikzpeople@person@paintsword
+			\fi
 			\if@tikzpeople@monitor
 				\tikzpeople@person@paintmonitor
 			\fi
 		\else
-			\tikzpeople@person@definecolors
-			\tikzpeople@person@definestyles
+			\tikzpeople@definecommoncolors
+			\tikzpeople@definecommonstyles
 			\tikzpeople@person@paintshirt
 			\tikzpeople@person@paintrighthorn
 			\tikzpeople@person@painthead
@@ -201,6 +234,12 @@
 			\tikzpeople@person@paintlefthorn
 			\tikzpeople@person@paintgoatee
 			\tikzpeople@person@painthalo
+			\if@tikzpeople@shield
+				\tikzpeople@person@paintshield
+			\fi
+			\if@tikzpeople@sword
+				\tikzpeople@person@paintsword
+			\fi
 			\if@tikzpeople@monitor
 				\tikzpeople@person@paintmonitor
 			\fi
@@ -208,35 +247,89 @@
 	}
 }
 
-\newcommand{\tikzpeople@person@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!20, bottom color=\tikzpeople@shirt!80,shading angle=45]
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45]
-	\tikzstyle{hair}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{goatee}=[color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45];
-	\tikzstyle{horns}=[color=red!80,top color=red!40, bottom color=red!80,shading angle=45];
-	\tikzstyle{halo}=[color=yellow!80,top color=yellow!40, bottom color=yellow!80,shading angle=45];
+\newcommand{\tikzpeople@definecommonstyles}{
+	\if@tikzpeople@saturated
+		\tikzset{
+			shirt/.style=       {color=\tikzpeople@shirt,top color=\tikzpeople@shirt!70, bottom color=\tikzpeople@shirt,shading angle=45},
+			hat/.style=         {color=\tikzpeople@hat,top color=\tikzpeople@hat!70, bottom color=\tikzpeople@hat,shading angle=45},
+			undershirt/.style=  {color=\tikzpeople@undershirt,top color=\tikzpeople@undershirt!70, bottom color=\tikzpeople@undershirt,shading angle=45},
+			skin/.style=        {color=\tikzpeople@skin,top color=\tikzpeople@skin!70, bottom color=\tikzpeople@skin,shading angle=45},
+			hair/.style=        {color=\tikzpeople@hair,top color=\tikzpeople@hair!70, bottom color=\tikzpeople@hair,shading angle=45},
+			goatee/.style=      {color=\tikzpeople@hair,top color=\tikzpeople@hair!70, bottom color=\tikzpeople@hair,shading angle=45},
+			horns/.style=       {color=\tikzpeople@horns,top color=\tikzpeople@horns!70, bottom color=\tikzpeople@horns,shading angle=45},
+			halo/.style=        {color=\tikzpeople@halo,top color=\tikzpeople@halo!70, bottom color=\tikzpeople@halo,shading angle=45},
+			shieldmid/.style=   {color=\tikzpeople@shieldmid,top color=\tikzpeople@shieldmid!70, bottom color=\tikzpeople@shieldmid,shading angle=45,line join=bevel},
+			shieldedge/.style=  {color=\tikzpeople@shieldedge,top color=\tikzpeople@shieldedge!70, bottom color=\tikzpeople@shieldedge,shading angle=45,line join=bevel},
+			shieldrivets/.style={color=\tikzpeople@shieldrivets,top color=\tikzpeople@shieldrivets!70, bottom color=\tikzpeople@shieldrivets,shading angle=45},
+			swordblade/.style=  {color=\tikzpeople@swordblade,top color=\tikzpeople@swordblade!70, bottom color=\tikzpeople@swordblade,shading angle=45},
+			swordguard/.style=  {color=\tikzpeople@swordguard,top color=\tikzpeople@swordguard!70, bottom color=\tikzpeople@swordguard,shading angle=45},
+			swordpommel/.style= {color=\tikzpeople@swordpommel,top color=\tikzpeople@swordpommel!70, bottom color=\tikzpeople@swordpommel,shading angle=45},
+			swordgrip/.style=   {color=\tikzpeople@swordgrip,top color=\tikzpeople@swordgrip!70, bottom color=\tikzpeople@swordgrip,shading angle=45},
+			monitor1/.style=    {color=\tikzpeople@pc, top color=\tikzpeople@pc, bottom color=\tikzpeople@pc!70,shading angle=90},
+			monitor2/.style=    {color=\tikzpeople@pc, top color=\tikzpeople@pc, bottom color=\tikzpeople@pc!90,shading angle=90},
+			monitor3/.style=    {color=\tikzpeople@pc, top color=\tikzpeople@pc!80, bottom color=\tikzpeople@pc!70,shading angle=90},
+			monitor4/.style=    {color=\tikzpeople@pc, top color=\tikzpeople@pc!60, bottom color=\tikzpeople@pc!50,shading angle=90},
+		}
+	\else
+		\tikzset{
+			shirt/.style=       {color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45},
+			hat/.style=         {color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45},
+			undershirt/.style=  {color=\tikzpeople@undershirt!80,top color=\tikzpeople@undershirt!40, bottom color=\tikzpeople@undershirt!80,shading angle=45},
+			skin/.style=        {color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45},
+			hair/.style=        {color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45},
+			goatee/.style=      {color=\tikzpeople@hair!80,top color=\tikzpeople@hair!40, bottom color=\tikzpeople@hair!80,shading angle=45},
+			horns/.style=       {color=\tikzpeople@horns!80,top color=\tikzpeople@horns!40, bottom color=\tikzpeople@horns!80,shading angle=45},
+			halo/.style=        {color=\tikzpeople@halo!80,top color=\tikzpeople@halo!40, bottom color=\tikzpeople@halo!80,shading angle=45},
+			shieldmid/.style=   {color=\tikzpeople@shieldmid!80,top color=\tikzpeople@shieldmid!40, bottom color=\tikzpeople@shieldmid!80,shading angle=45,line join=bevel},
+			shieldedge/.style=  {color=\tikzpeople@shieldedge!80,top color=\tikzpeople@shieldedge!40, bottom color=\tikzpeople@shieldedge!80,shading angle=45,line join=bevel},
+			shieldrivets/.style={color=\tikzpeople@shieldrivets!80,top color=\tikzpeople@shieldrivets!40, bottom color=\tikzpeople@shieldrivets!80,shading angle=45},
+			swordblade/.style=  {color=\tikzpeople@swordblade!80,top color=\tikzpeople@swordblade!40, bottom color=\tikzpeople@swordblade!80,shading angle=45},
+			swordguard/.style=  {color=\tikzpeople@swordguard!80,top color=\tikzpeople@swordguard!40, bottom color=\tikzpeople@swordguard!80,shading angle=45},
+			swordpommel/.style= {color=\tikzpeople@swordpommel!80,top color=\tikzpeople@swordpommel!40, bottom color=\tikzpeople@swordpommel!80,shading angle=45},
+			swordgrip/.style=   {color=\tikzpeople@swordgrip!80,top color=\tikzpeople@swordgrip!40, bottom color=\tikzpeople@swordgrip!80,shading angle=45},
+			monitor1/.style=    {color=\tikzpeople@pc!80, top color=\tikzpeople@pc!80, bottom color=\tikzpeople@pc!40,shading angle=90},
+			monitor2/.style=    {color=\tikzpeople@pc!80, top color=\tikzpeople@pc!80, bottom color=\tikzpeople@pc!70,shading angle=90},
+			monitor3/.style=    {color=\tikzpeople@pc!80, top color=\tikzpeople@pc!60, bottom color=\tikzpeople@pc!50,shading angle=90},
+			monitor4/.style=    {color=\tikzpeople@pc!80, top color=\tikzpeople@pc!40, bottom color=\tikzpeople@pc!30,shading angle=90},
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@person@draftstyles}{
-	\tikzstyle{shirt}=[color=black,fill=white];
-	\tikzstyle{skin}=[color=black,fill=white];
-	\tikzstyle{hair}=[color=black,fill=white];
-	\tikzstyle{goatee}=[color=black,fill=white];
-	\tikzstyle{horns}=[color=black,fill=white];
-	\tikzstyle{halo}=[color=black,fill=white];
+	\tikzset{
+			shirt/.style=       {color=black,fill=white},
+			skin/.style=        {color=black,fill=white},
+			goatee/.style=      {color=black,fill=white},
+			horns/.style=       {color=black,fill=white},
+			halo/.style=        {color=black,fill=white},
+			shieldedge/.style=  {color=black,fill=white},
+			swordblade/.style=  {color=black,fill=white},
+			swordguard/.style=  {color=black,fill=white},
+			swordpommel/.style= {color=black,fill=white},
+			swordgrip/.style=   {color=black,fill=white},
+		}
 }
 
-\newcommand{\tikzpeople@person@definecolors}{
+\newcommand{\tikzpeople@definecommoncolors}{
+	\definecolor{horns}{named}{red}
+	\definecolor{halo}{named}{yellow}
 	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{shirt}{rgb}{0.34,0.56,0.22}
 	\definecolor{hair}{rgb}{0.45,0.24,0}
-	\definecolor{pc}{rgb}{0,0,0}
+	\definecolor{pc}{rgb}{.2,.2,.2}
+	\definecolor{shieldedge}{RGB}{83,84,85}
+	\definecolor{shieldrivets}{RGB}{25,25,26}
+	\definecolor{shieldmid}{RGB}{197,22,9}
+	\definecolor{swordblade}{RGB}{83,84,85}
+	\definecolor{swordguard}{RGB}{147,131,104}
+	\definecolor{swordpommel}{RGB}{147,131,104}
+	\definecolor{swordgrip}{RGB}{81,57,48}
 }
 
 \newcommand{\tikzpeople@person@paintshirt}{
 	\draw[shirt] 
 		(-4.0pt,-8.0pt) .. controls (-2pt,-10pt) and ( 3pt,-9pt) .. 
-		( 5.0pt,-7.0pt) .. controls ( 5pt,  0pt) and (-5pt, 0pt) .. 
+		( 5.0pt,-7.0pt) .. controls ( 5pt, 0pt) and (-5pt, 0pt) .. 
 		(-4.0pt,-8.0pt) -- cycle;
 }
 
@@ -260,8 +353,8 @@
 	\else
 	\draw[hair]
 		(15:3pt) arc (15:210:3pt) -- ++(0.3pt,0pt) -- ++(0.1pt,0.5pt)
-		.. controls +(310:.2pt)   .. ++(0.2pt,-0.6pt) -- ++(0.4pt,0pt) 
-		.. controls +(90:1pt)     .. (-1.7pt,0.4pt) to[out=350,in=210]
+		.. controls +(310:.2pt) .. ++(0.2pt,-0.6pt) -- ++(0.4pt,0pt) 
+		.. controls +(90:1pt) .. (-1.7pt,0.4pt) to[out=350,in=210]
 		(15:3pt) -- cycle;
 	\fi
 }
@@ -275,8 +368,8 @@
 
 \newcommand{\tikzpeople@person@paintfemalehairstylethree}{
 	\draw[hair]
-		(15:3pt) arc (15:180:3.3pt) .. controls +(269:3pt) and +(190:1.5pt)  
-		..  (250:3.4pt) .. controls +(118:1.2pt) .. (-1.6pt,0pt) to [out=350,in=210]
+		(15:3pt) arc (15:180:3.3pt) .. controls +(269:3pt) and +(190:1.5pt) 
+		.. (250:3.4pt) .. controls +(118:1.2pt) .. (-1.6pt,0pt) to [out=350,in=210]
 		(15:3pt)-- cycle;
 }
 
@@ -286,11 +379,11 @@
 	\if@tikzpeople@evil
 		{
 			\pgftransformrotate{5}
-			\draw[goatee] (285:1.75pt)  
-			-- ++(0:1pt)    arc[start angle=90,  end angle=0,    x radius=.55pt, y radius=.5pt]
-			-- ++(270:.5pt) arc[start angle=0,   end angle=-90,  x radius=.55pt, y radius=.5pt]
-			-- ++(180:1pt)  arc[start angle=-90, end angle=-180, x radius=.55pt, y radius=.5pt]
-			-- ++(90:.5pt)  arc[start angle=180, end angle=90,   x radius=.55pt, y radius=.5pt]
+			\draw[goatee] (285:1.75pt) 
+			-- ++(0:1pt) arc[start angle=90, end angle=0, x radius=.55pt, y radius=.5pt]
+			-- ++(270:.5pt) arc[start angle=0, end angle=-90, x radius=.55pt, y radius=.5pt]
+			-- ++(180:1pt) arc[start angle=-90, end angle=-180, x radius=.55pt, y radius=.5pt]
+			-- ++(90:.5pt) arc[start angle=180, end angle=90, x radius=.55pt, y radius=.5pt]
 			(285:1.75pt) ++(.1875pt,-.3pt) 
 			arc[start angle=90,end angle=270,x radius=.45pt, y radius=.3pt]
 			-- ++(0:.6pt) arc[start angle=-90,end angle=90,x radius=.45pt, y radius=.3pt] 
@@ -302,59 +395,198 @@
 
 \newcommand{\tikzpeople@person@paintlefthorn}{
 	\if@tikzpeople@evil
-		\draw[horns] (140:2.5pt) arc (-90:-170:2pt) arc (0:180:0.04pt) arc (190:240:4pt) to[out=70,in=290] (140:2.5pt) -- cycle;
+		\draw[horns] 
+			(140:2.5pt) arc (-90:-170:2pt) arc (0:180:0.04pt) arc (190:240:4pt) 
+			to[out=70,in=290] (140:2.5pt) -- cycle;
 	\fi
 }
 
 \newcommand{\tikzpeople@person@paintrighthorn}{
 	\if@tikzpeople@evil
-		\draw[horns] (40:2.5pt)  arc (-90:-10:2pt) arc (180:0:0.04pt) arc (-10:-60:4pt) to[out=110,in=250] (40:2.5pt) -- cycle;
+		\draw[horns] 
+			(40:2.5pt) arc (-90:-10:2pt) arc (180:0:0.04pt) arc (-10:-60:4pt) 
+			to[out=110,in=250] (40:2.5pt) -- cycle;
 	\fi
 }
 
 \newcommand{\tikzpeople@person@painthalo}{
 	\if@tikzpeople@good
 		\draw[fill,halo,even odd rule]
-			(0.1pt,4.5pt) ellipse (2.8pt and 0.8pt)	++(0pt,.1pt) ellipse (2pt and 0.5pt);
+			(0.1pt,4.5pt) ellipse (2.8pt and 0.8pt)	++(0pt,.1pt) ellipse 
+			(2pt and 0.5pt);
 	\fi
 }
 
 \newcommand{\tikzpeople@person@paintfemalehair}{
 	\draw[hair]
-		(15:3pt) arc (15:180:3pt) .. controls +(273:2pt) and +(190:2pt)  ..  (260:3.3pt) .. controls +(140:1pt) ..
-		 (-1.6pt,0pt) to [out=350,in=210]
+		(15:3pt) arc (15:180:3pt) .. controls +(273:2pt) and +(190:2pt) .. 
+		(260:3.3pt) .. controls +(140:1pt) .. (-1.6pt,0pt) to [out=350,in=210]
 		(15:3pt) -- cycle;
 }
 
+\newcommand{\tikzpeople@person@paintshield}{
+	\path
+		(1pt,-3.7pt) coordinate (tikzpeople@shield1) +(-.2pt,.1pt) coordinate 
+		(tikzpeople@shield6) ++(1.2pt,1.2pt) coordinate (tikzpeople@shield2) 
+		++(3.5pt,1.3pt) coordinate (tikzpeople@shield3) ++(.8pt,-.75pt) coordinate 
+		(tikzpeople@shield4) ++(-2pt,-6.5pt) coordinate (tikzpeople@shield5) 
+		--cycle;
+	\draw[shieldedge] 
+		(tikzpeople@shield1) -- (tikzpeople@shield6) to[out=0,in=270] 
+		++(1.2pt,1.2pt) -- (tikzpeople@shield2) to[out=270,in=0] 
+		(tikzpeople@shield1) --cycle;
+	\draw[shieldedge]
+		(tikzpeople@shield3) -- ++(-.2pt,.1pt) to[out=265,in=220] 
+		++(.8pt,-.75pt) -- (tikzpeople@shield4) to[out=220,in=265] 
+		(tikzpeople@shield3) --cycle;
+	\draw[shieldedge] 
+		(tikzpeople@shield2) -- ++(-.2pt,.1pt) .. controls +(5:1.5pt) and 
+		+(220:1.5pt) .. ++(3.5pt,1.3pt) -- (tikzpeople@shield3) .. controls 
+		+(220:1.5pt) and +(5:1.5pt) .. (tikzpeople@shield2) --cycle;
+	\draw[shieldedge] 
+		(tikzpeople@shield5) -- ++(-.2pt,.1pt) .. controls +(170:1.5pt) and 
+		+(270:3pt) .. (tikzpeople@shield6) -- (tikzpeople@shield1) .. controls 
+		+(270:3pt) and +(170:1.5pt) .. (tikzpeople@shield5) --cycle;
+	\draw[shieldedge] 
+		(tikzpeople@shield1) to[out=0,in=270] (tikzpeople@shield2) .. controls 
+		+(5:1.5pt) and +(220:1.5pt)	.. (tikzpeople@shield3) to[out=265,in=220] 
+		(tikzpeople@shield4) .. controls +(270:3pt) and +(30:1.5pt) .. 
+		(tikzpeople@shield5) .. controls +(170:1.5pt) and +(270:3pt) .. 
+		(tikzpeople@shield1) --cycle;
+	\if@tikzpeople@draft\else
+		\draw[shieldmid] 
+			($(tikzpeople@shield1)+(315:.5pt)$) to[out=10,in=260] 
+			($(tikzpeople@shield2)+(315:.5pt)$) .. controls +(7:1.2pt) and 
+			+(215:1.2pt) .. ($(tikzpeople@shield3)+(250:.75pt)$) to[out=280,in=180] 
+			($(tikzpeople@shield4)+(235:.625pt)$) .. controls +(270:2.2pt) and 
+			+(30:1.1pt) .. ($(tikzpeople@shield5)+(90:.5pt)$) .. controls 
+			+(172:1.1pt) and +(271:2.2pt) .. ($(tikzpeople@shield1)+(315:.5pt)$) 
+			--cycle;
+		\begin{scope}
+			\clip 
+				($(tikzpeople@shield1)+(315:.3pt)$) coordinate (tikzpeople@rivet1) circle (.05pt)
+				($(tikzpeople@shield2)+(315:.3pt)$) coordinate (tikzpeople@rivet2) circle (.05pt)
+				($(tikzpeople@shield3)+(250:.45pt)$) coordinate (tikzpeople@rivet3) circle (.05pt)
+				($(tikzpeople@shield4)+(235:.4pt)$) coordinate (tikzpeople@rivet4) circle (.05pt)
+				($(tikzpeople@shield5)+(90:.3pt)$) coordinate (tikzpeople@rivet5) circle (.05pt);
+				\path[shieldrivets] (tikzpeople@rivet1) ++(-.025pt,.025pt) circle (.12pt);
+				\path[shieldrivets] (tikzpeople@rivet2) ++(-.025pt,.025pt) circle (.12pt);
+				\path[shieldrivets] (tikzpeople@rivet3) ++(-.025pt,.025pt) circle (.12pt);
+				\path[shieldrivets] (tikzpeople@rivet4) ++(-.025pt,.025pt) circle (.12pt);
+				\path[shieldrivets] (tikzpeople@rivet5) ++(-.025pt,.025pt) circle (.12pt);
+		\end{scope}
+	\fi
+}
+
+\newcommand{\tikzpeople@person@paintsword}{
+	\begin{scope}
+		\pgftransformrotate{-30}
+		\pgftransformshift{\pgfpoint{1.7pt}{-.2pt}}
+		\draw[swordpommel]
+			(-.4pt,-8.9pt) -- ++(0pt,-.1pt) arc (180:360:.4pt and .15pt) -- 
+			++(0pt,.1pt); ellipse (.4pt and .15pt);
+		\draw[swordpommel] (0pt,-8.9pt) ellipse (.4pt and .15pt);
+		\draw[swordgrip] 
+			(-.2pt,-7.1pt) to[out=265,in=95] (-.2pt,-8.9pt) to[out=345,in=195] 
+			(.2pt,-8.9pt) to[out=85,in=275] (.2pt,-7.1pt);
+		\draw[skin] (0pt,-8.1pt) ellipse (.6pt and .7pt);
+		\draw[swordguard] 
+			(0pt,-7.45pt) to[out=0,in=270] (1.4pt,-6.5pt) -- ++(-.1pt,-.1pt) 
+			to[out=270,in=0] (0pt,-7.45pt); to[out=0,in=270] (1.2pt,-6.6pt) -- 
+			++(.1pt,.1pt) to[out=270,in=0] (0pt,-6.8pt);
+		\draw[swordguard] 
+			(0pt,-6.8pt) to[out=180,in=270] (-1.1pt,-6.5pt) -- ++(-.1pt,-.1pt) 
+			to[out=270,in=180] (0pt,-7.2pt) to[out=0,in=270] (1.2pt,-6.6pt) -- 
+			++(.1pt,.1pt) to[out=270,in=0] (0pt,-6.8pt);
+		\draw[swordguard] 
+			(-1.2pt,-6.6pt) -- ++(0.1pt,0.1pt) -- ++(-0.1pt,0pt) -- ++(-0.1pt,-0.1pt) 
+			--cycle;
+		\draw[swordguard] 
+			(1.2pt,-6.6pt) -- ++(0.1pt,0.1pt) -- ++(0.1pt,0pt) -- ++(-0.1pt,-0.1pt) 
+			--cycle;
+		\draw[swordguard] 
+			(0pt,-7.2pt) to[out=180,in=270] (-1.2pt,-6.6pt) -- ++(-.1pt,0pt) 
+			to[out=270,in=180] (0pt,-7.45pt) to[out=0,in=270] (1.3pt,-6.6pt) -- 
+			++(-.1pt,0pt) to[out=270,in=0] (0pt,-7.2pt);
+		\draw[swordblade] 
+			(-.4pt,-7pt) -- (-.4pt,-1.5pt) to[out=90,in=240] (0pt,2pt) 
+			to[out=300,in=90] (.4pt,-1.5pt) -- (.4pt,-7pt) to[out=190,in=350] 
+			(-.4pt,-7pt);
+		{
+			\clip 
+				(-.4pt,-7pt) -- (-.4pt,-1.5pt) to[out=90,in=240] (0pt,1pt) 
+				to[out=300,in=90] (.4pt,-1.5pt) -- (.4pt,-7pt) to[out=190,in=350] 
+				(-.4pt,-7pt);
+			\draw[swordblade, line width=.05*\scalingfactor,cap=round] 
+				(0pt,-7.04pt) -- (0pt,.7pt);
+		}
+	\end{scope}
+}
+
 \newcommand{\tikzpeople@person@paintmonitor}{
 	\if@tikzpeople@draft
-		\path[draw=black,fill=white] (2.3pt,-2.3pt) -- ++(14:7.3pt) -- ++(340:.27pt) coordinate (tmp) -- ++(264:6.2pt) -- ++(195.5:7.35pt) coordinate (tmp2) -- ++(135:.3pt) --cycle;
-		\path[draw=black] (2.3pt,-2.3pt) ++(330:.28pt) coordinate (tmp3) (tmp2) -- (tmp3) -- (tmp);
-		\path[draw=black] (3pt,-3pt) -- ++(14.5:6.4pt) -- ++(264:5.3pt) -- ++(195.5:6.35pt) coordinate (tmp) --cycle;
-		\path[draw=black,line width=.15*\scalingfactor,cap=butt] (tmp) -- (3pt,-3pt) -- ++(14.5:6.4pt);
-		\path[draw=black,fill=white] (6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-1.5pt,.2pt) coordinate (tmp) -- ++(325:1.6pt) -- ++(15:3.7pt) -- ++(145:1.6pt) --cycle;
-		\path[draw=black] (tmp) -- ++(0,-.2pt) -- ++(325:1.6pt) -- ++(15:3.7pt) -- ++(0,.2pt);
-		\path (6.1pt,-4.8pt) ++(17:.8pt) coordinate (tmp);
-		\path[draw=black,fill=white] (tmp) ++(0,.01pt) -- ++(194:1.5pt) -- ++(280:4pt) -- ++(0:.07pt) -- ++(17:.5pt) --cycle;
-		\path[draw=black,fill=white] (6.1pt,-4.8pt) ++(190:.6pt) -- ++(280:4pt) coordinate (tmp2) -- ++(15:2pt) -- (tmp) --cycle;
+		\path[draw=black,fill=white] 
+			(2.3pt,-2.3pt) -- ++(14:7.3pt) -- ++(340:.27pt) coordinate (tikzpeople@tmp) -- 
+			++(264:6.2pt) -- ++(195.5:7.35pt) coordinate (tikzpeople@tmp2) -- ++(135:.3pt) 
+			--cycle;
+		\path[draw=black] 
+			(2.3pt,-2.3pt) ++(330:.28pt) coordinate (tikzpeople@tmp3) 
+			(tikzpeople@tmp2) -- (tikzpeople@tmp3) -- (tikzpeople@tmp);
+		\path[draw=black] 
+			(3pt,-3pt) -- ++(14.5:6.4pt) -- ++(264:5.3pt) -- ++(195.5:6.35pt) 
+			coordinate (tikzpeople@tmp) --cycle;
+		\path[draw=black,line width=.15*\scalingfactor,cap=butt] 
+			(tikzpeople@tmp) -- (3pt,-3pt) -- ++(14.5:6.4pt);
+		\path[draw=black,fill=white] 
+			(6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-1.5pt,.2pt) coordinate (tikzpeople@tmp) 
+			-- ++(325:1.6pt) -- ++(15:3.7pt) -- ++(145:1.6pt) --cycle;
+		\path[draw=black] 
+			(tikzpeople@tmp) -- ++(0,-.2pt) -- ++(325:1.6pt) -- ++(15:3.7pt) -- ++(0,.2pt);
+		\path (6.1pt,-4.8pt) ++(17:.8pt) coordinate (tikzpeople@tmp);
+		\path[draw=black,fill=white] 
+			(tikzpeople@tmp) ++(0,.01pt) -- ++(194:1.5pt) -- ++(280:4pt) -- ++(0:.07pt) -- 
+			++(17:.5pt) --cycle;
+		\path[draw=black,fill=white] 
+			(6.1pt,-4.8pt) ++(190:.6pt) -- ++(280:4pt) coordinate (tikzpeople@tmp2) -- ++(15:2pt)
+			-- (tikzpeople@tmp) --cycle;
 	\else
-		\path[top color=\tikzpeople@pc, bottom color=\tikzpeople@pc!60,shading angle=135] (2.3pt,-2.3pt) -- ++(14:7.3pt) -- ++(340:.27pt) coordinate (tmp) -- ++(264:6.2pt) -- ++(195.5:7.35pt) coordinate (tmp2) -- ++(135:.3pt) --cycle;
-		\path[top color=\tikzpeople@pc!60, bottom color=\tikzpeople@pc!50,shading angle=135] (2.3pt,-2.3pt) ++(330:.28pt) -- (tmp) -- ++(264:6.2pt) -- (tmp2) --cycle;
-		\path[top color=\tikzpeople@pc!40, bottom color=\tikzpeople@pc!30,shading angle=45] (3pt,-3pt) -- ++(14.5:6.4pt) -- ++(264:5.3pt) -- ++(195.5:6.35pt) coordinate (tmp) --cycle;
-		\path[draw,color=black!20,line width=.15*\scalingfactor,cap=butt] (tmp) -- (3pt,-3pt) -- ++(14.5:6.4pt);
+		\path[monitor1]
+			(2.3pt,-2.3pt) -- ++(14:7.3pt) -- ++(340:.27pt) coordinate (tikzpeople@tmp) -- 
+			++(195:7.3pt) -- ++(264:6.2pt) coordinate (tikzpeople@tmp2) -- ++(150:.27pt) --cycle;
+		\path[monitor3]
+			(2.3pt,-2.3pt) ++(330:.28pt) -- (tikzpeople@tmp) -- ++(264:6.2pt) -- (tikzpeople@tmp2) --cycle;
+		\path[monitor4] 
+			(3pt,-3pt) -- ++(14.5:6.4pt) -- ++(264:5pt) -- ++(195:6.35pt) 
+			coordinate (tikzpeople@tmp) --cycle;
+		\path[draw,color=\tikzpeople@pc\if@tikzpeople@saturated\else!80\fi,line width=.15*\scalingfactor,cap=butt] 
+			(tikzpeople@tmp) -- (3pt,-3pt) -- ++(14.5:6.4pt);
 		\begin{scope}
 			\pgftransformshift{\pgfpoint{6pt}{-4.7pt}}
 			\pgftransformxslant{0.15}
-			\path[top color=\tikzpeople@pc, bottom color=\tikzpeople@pc!60,shading angle=90] (0,0) ellipse (1.3pt and 2pt);
-			\path[top color=\tikzpeople@pc!55, bottom color=\tikzpeople@pc!50,shading angle=135] (.1pt,-.1pt) ellipse (1.3pt and 2pt);
+			\path[monitor1] 
+				(0,0) ellipse (1.3pt and 2pt);
+			\path[monitor3] 
+				(.1pt,-.1pt) ellipse (1.3pt and 2pt);
 		\end{scope}
-		\path[top color=\tikzpeople@pc!75, bottom color=\tikzpeople@pc!70,shading angle=135] (6.1pt,-4.8pt) ++(160:.9pt) -- ++(15:2pt) -- ++(265:1pt) -- ++(195:2pt) --cycle;
-		\path (6.1pt,-4.8pt) ++(17:.8pt) coordinate (tmp);
-		\path[top color=\tikzpeople@pc, bottom color=\tikzpeople@pc!40,shading angle=90] (6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-1.5pt,.2pt) -- ++(0,-.2pt) -- ++(325:1.6pt) -- ++(15:3.7pt) -- ++(0,.2pt) -- cycle;
-		\path[top color=\tikzpeople@pc!60, bottom color=\tikzpeople@pc!45,shading angle=90] (6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-1.5pt,.2pt) -- ++(325:1.6pt) -- ++(15:3.7pt) -- ++(145:1.6pt) --cycle;
-		\path[top color=\tikzpeople@pc, bottom color=\tikzpeople@pc!90,shading angle=80] (6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-.6pt,.2pt) -- ++(325:.8pt) -- ++(15:2.5pt) -- ++(145:.8pt) --cycle;
-		\path[top color=\tikzpeople@pc!70, bottom color=\tikzpeople@pc] (tmp) ++(0,.01pt) -- ++(194:1.5pt) -- ++(280:4pt) -- ++(0:.07pt) -- ++(17:.5pt) --cycle;
-		\path[top color=\tikzpeople@pc!60, bottom color=\tikzpeople@pc!45,shading angle=90] (6.1pt,-4.8pt) ++(190:.6pt) -- ++(280:4pt) coordinate (tmp2) -- ++(15:2pt) -- (tmp) --cycle;
+		\path[monitor2] 
+			(6.05pt,-4.8pt) ++(160:.9pt) -- ++(15:2pt) -- ++(265:1pt) -- ++(195:2pt) 
+			--cycle;
+		\path (6.1pt,-4.8pt) ++(17:.8pt) coordinate (tikzpeople@tmp);
+		\path[monitor1] 
+			(6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-1.5pt,.2pt) -- ++(0,-.2pt) -- 
+			++(325:1.6pt) -- ++(15:3.7pt) -- ++(0,.2pt) -- cycle;
+		\path[monitor3] 
+			(6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-1.5pt,.2pt) -- ++(325:1.6pt) 
+			-- ++(15:3.7pt) -- ++(145:1.6pt) --cycle;
+		\path[monitor2] 
+			(6.1pt,-4.8pt) ++(190:.6pt) ++(280:4pt) ++(-.6pt,.2pt) -- ++(325:.8pt) -- 
+			++(15:2.5pt) -- ++(145:.8pt) --cycle;
+		\path[monitor2] 
+			(tikzpeople@tmp) ++(0,.01pt) -- ++(194:1.5pt) -- ++(280:4pt) -- ++(0:.07pt) -- 
+			++(17:.5pt) --cycle;
+		\path[monitor3] 
+			(6.1pt,-4.8pt) ++(190:.6pt) -- ++(280:4pt) coordinate (tikzpeople@tmp2) -- ++(15:2pt)
+			-- (tikzpeople@tmp) --cycle;
 	\fi
 }
 
@@ -396,6 +628,12 @@
 			\tikzpeople@person@paintgoatee
 			\tikzpeople@person@paintlefthorn
 			\tikzpeople@person@painthalo
+			\if@tikzpeople@shield
+				\tikzpeople@person@paintshield
+			\fi
+			\if@tikzpeople@sword
+				\tikzpeople@person@paintsword
+			\fi
 			\if@tikzpeople@monitor
 				\tikzpeople@person@paintmonitor
 			\fi
@@ -431,12 +669,19 @@
 				\pgftransformxshift{-0.325}
 			\fi
 			\pgftransformshift{\pgfpoint{-0.3}{3.3}}
-			\tikzpeople@person@definecolors
+			\tikzpeople@definecommoncolors
 			\csname tikzpeople@#1@definecolors\endcsname
+			\tikzpeople@definecommonstyles
 			\csname tikzpeople@#1@definestyles\endcsname
 			\begin{scope}
 				\csname tikzpeople@#1@paint\endcsname
 			\end{scope}
+			\if@tikzpeople@shield
+				\tikzpeople@person@paintshield
+			\fi
+			\if@tikzpeople@sword
+				\tikzpeople@person@paintsword
+			\fi
 			\if@tikzpeople@monitor
 				\tikzpeople@person@paintmonitor
 			\fi
@@ -453,8 +698,8 @@
 	\fi
 }
 
-\newif\ifalltikzpeople@star
 \if@tikzpeople@demo
+	\RequirePackage{xparse}
 	\RequirePackage{capt-of}
 	\RequirePackage{xifthen}
 	\newcounter{tikzpeople@shaperow}
@@ -465,24 +710,24 @@
 	\newlength{\tikzpeople@captionht}
 
 	\newcommand{\tikzpeople@horizontalseparation}[1]{
-		\draw ($#1*(-1,1.25) + {2.5*#1}*(0,-\value{tikzpeople@shaperow})$)--+(${2*#1}*(\value{tikzpeople@shapecolumn},0)$);			
+		\draw
+			($#1*(-1,1.25) + {2.5*#1}*(0,-\value{tikzpeople@shaperow})$) -- 
+			+(${2*#1}*(\value{tikzpeople@shapecolumn},0)$);			
 	}
 
 	\newcommand{\tikzpeople@verticalseparation}[1]{
-		\draw ($#1*(-1,1.25) + {2*#1}*(\value{tikzpeople@shapecolumn},0) + {2.5*#1}*(0,-\value{tikzpeople@shaperow})$)--+($2.5*(0,-#1)$);
-	}
-
-	\newcommand{\alltikzpeople}{%
-		\@ifstar{\alltikzpeople@startrue\alltikzpeople@i*}{\alltikzpeople@starfalse\alltikzpeople@i*}%
+		\draw 
+			($#1*(-1,1.25) + {2*#1}*(\value{tikzpeople@shapecolumn},0) + {2.5*#1}*(0,-\value{tikzpeople@shaperow})$)
+			-- +($2.5*(0,-#1)$);
 	}
 
-	\def\alltikzpeople@i*#1#2{%
-		\setlength{\tikzpeople@figwidth}{#1cm}
+	\NewDocumentCommand\alltikzpeople{smm}{%
+		\setlength{\tikzpeople@figwidth}{#2cm}
 		\edef\tikzpeople@foreachshape{\noexpand\foreach \noexpand\tikzpeople@shape in {\tikzpeople@shapelist}}
 		\edef\tikzpeople@numcols{\the\numexpr(\textwidth-(\tikzpeople@figwidth))/(2*\tikzpeople@figwidth)\relax}
 		\addtocounter{figure}{10}
 		\settototalheight{\tikzpeople@captionht}{%
-			\vbox{\captionof{figure}{All available characters with \texttt{minimum width=#1cm} and no additional options.}}
+			\vbox{\captionof{figure}{All available characters with \texttt{minimum width=#2cm} and no additional options.}}
 		}%
 		\addtocounter{figure}{-11}
 		\edef\tikzpeople@numrows{\the\numexpr(2*(\textheight-\tikzpeople@captionht)-(5*\tikzpeople@figwidth/2))/(5*\tikzpeople@figwidth)\relax}
@@ -500,30 +745,30 @@
 				\begin{tikzpicture}
 					\tikzpeople@foreachshape{
 						\stepcounter{tikzpeople@shapenum}
-						\ifthenelse{\value{tikzpeople@shapenum} >  \numexpr(\tikzpeople@fignum-1)*\tikzpeople@numshapes\relax}{
+						\ifthenelse{\value{tikzpeople@shapenum} > \numexpr(\tikzpeople@fignum-1)*\tikzpeople@numshapes\relax}{
 							\ifthenelse{\value{tikzpeople@shapenum} < \numexpr\tikzpeople@fignum*\tikzpeople@numshapes+1\relax}{
-								\coordinate (\tikzpeople@shape) at (${2*#1}*(\value{tikzpeople@shapecolumn},0) + {2.5*#1}*(0,-\value{tikzpeople@shaperow})$);
-								\node[minimum width=#1cm,\tikzpeople@shape,#2]      at (\tikzpeople@shape) {\texttt{\ifalltikzpeople@star\else\tikzpeople@shape\fi}};
-								\tikzpeople@verticalseparation{#1}
+								\coordinate (\tikzpeople@shape) at (${2*#2}*(\value{tikzpeople@shapecolumn},0) + {2.5*#2}*(0,-\value{tikzpeople@shaperow})$);
+								\node[minimum width=#2cm,\tikzpeople@shape,#3] at (\tikzpeople@shape) {\texttt{\IfBooleanTF#1{}{\tikzpeople@shape}}};
+								\tikzpeople@verticalseparation{#2}
 								\stepcounter{tikzpeople@shapecolumn}
 								\ifthenelse{\value{tikzpeople@shapecolumn}=\tikzpeople@numcols}{
-									\tikzpeople@verticalseparation{#1}
-									\ifthenelse{\value{tikzpeople@shaperow}=0}{\tikzpeople@horizontalseparation{#1}}{}
+									\tikzpeople@verticalseparation{#2}
+									\ifthenelse{\value{tikzpeople@shaperow}=0}{\tikzpeople@horizontalseparation{#2}}{}
 									\stepcounter{tikzpeople@shaperow}
-									\tikzpeople@horizontalseparation{#1}
+									\tikzpeople@horizontalseparation{#2}
 									\setcounter{tikzpeople@shapecolumn}{0}
 								}{}
 							}{}
 						}{}
 					}
 					\ifthenelse{\value{tikzpeople@shapecolumn}=0}{}{
-						\tikzpeople@verticalseparation{#1}
-						\ifthenelse{\value{tikzpeople@shaperow}=0}{\tikzpeople@horizontalseparation{#1}}{}
+						\tikzpeople@verticalseparation{#2}
+						\ifthenelse{\value{tikzpeople@shaperow}=0}{\tikzpeople@horizontalseparation{#2}}{}
 						\stepcounter{tikzpeople@shaperow}
-						\tikzpeople@horizontalseparation{#1}
+						\tikzpeople@horizontalseparation{#2}
 					}
 				\end{tikzpicture}
-				\caption{\tikzpeople@captiontext{#1}{#2}}
+				\caption{\tikzpeople@captiontext{#2}{#3}}
 				\label{fig:tikzpeoplefigure\tikzpeople@fignum}
 			\end{figure}
 		}
@@ -542,22 +787,23 @@
 
 	\newcommand{\tikzpeoplecolors}[1]{
 		\begin{minipage}{.95\textwidth}
-		\begin{center}
-			\centering
-			\expandafter\let\expandafter\tikzpeople@peoplecolors\csname tikzpeople@#1@colors\endcsname
-			\begin{tikzpicture}
-				\node[minimum width=2.5cm,#1] {};
-				\foreach \tikzpeople@name/\tikzpeople@angle/\tikzpeople@coords in \tikzpeople@peoplecolors{
-					\node (label) at (\tikzpeople@angle:2.5) {\tikzpeople@name};
-					\foreach \x/\y in \tikzpeople@coords{
-						\draw (label) edge (\x,\y);
+			\begin{center}
+				\centering
+				\expandafter\let\expandafter\tikzpeople@peoplecolors\csname tikzpeople@#1@colors\endcsname
+				\begin{tikzpicture}
+					\node[minimum width=2.5cm,#1] {};
+					\foreach \tikzpeople@name/\tikzpeople@angle/\tikzpeople@coords in \tikzpeople@peoplecolors{
+						\node (label) at (\tikzpeople@angle:2.5) {\tikzpeople@name};
+						\foreach \x/\y in \tikzpeople@coords{
+							\draw (label) edge (\x,\y);
+						}
 					}
-				}
-			\end{tikzpicture}
-			\captionof{figure}{The available color-keys for \texttt{#1} tikzpeople.}
-		\end{center}
+				\end{tikzpicture}
+				\captionof{figure}{The available color-keys for \texttt{#1} tikzpeople.}
+			\end{center}
 		\end{minipage}
 	}
+
 \fi
 
 \tikzpeople@declareshape{alice}
@@ -571,11 +817,14 @@
 \tikzpeople@declareshape{cowboy}
 \tikzpeople@declareshape{criminal}
 \tikzpeople@declareshape{dave}
+\tikzpeople@declareshape{devil}
+\tikzpeople@declareshape{duck}
 \tikzpeople@declareshape{graduate}
 \tikzpeople@declareshape{groom}
 \tikzpeople@declareshape{guard}
 \tikzpeople@declareshape{jester}
 \tikzpeople@declareshape{judge}
+\tikzpeople@declareshape{maninblack}
 \tikzpeople@declareshape{mexican}
 \tikzpeople@declareshape{nun}
 \tikzpeople@declareshape{nurse}
author	Karl Berry <karl@freefriends.org>	2016-11-28 23:47:56 +0000
committer	Karl Berry <karl@freefriends.org>	2016-11-28 23:47:56 +0000
commit	3bb968911fe7c1366654b04283a2b0c90968f212 (patch)
tree	07a7bcdabc295e16cdf5c0782c4cf7187f134e0c /Master/texmf-dist
parent	17096b7bd77fd18fc0e73e628b1ce5ab1dddca60 (diff)