diff --git a/monsters.tex b/monsters.tex
index bdc23b8bcccb4f973afbb5c592d756aa3e24fcfb..28b62db9f05890385e57c219c1f3e0ae53f5605c 100644
--- a/monsters.tex
+++ b/monsters.tex
@@ -176,7 +176,7 @@
 \renewcommand{\armourtype}{P}
 \gdef\armourtype{P}
 
-\begin{tcolorbox}
+\begin{tcolorbox}[title={\name}]
 \creaturestats
 
 \derivedstats
@@ -199,12 +199,20 @@
 
 \renewcommand{\armourtype}{C}
 
-\begin{tcolorbox}
+\begin{tcolorbox}[title={\name}]
 \creaturestats
 
 \derivedstats
 
 \end{tcolorbox}
+
+\iftoggle{personality}{
+Personality: \personality
+
+Mannerism: \mannerism
+
+\settoggle{personality}{false}}%
+{}
 }
 
 \newcommand{\clean}{
diff --git a/preamble.tex b/preamble.tex
index d4db78cd12c6adeeae0a677685c131453c4b72ac..ea31cef1ab923509e0aa3271818a464d8c1bd241 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -33,7 +33,7 @@
 \usepackage{colortbl}
 \usepackage[poster]{tcolorbox}
 \tcbuselibrary{breakable,raster}
-\tcbset{enhanced,drop shadow east,colback=white,breakable,arc=6mm,outer arc=1mm}
+\tcbset{enhanced, attach boxed title to top center={yshift*=-3mm},drop shadow east,colback=white,breakable,arc=6mm,outer arc=1mm}
 
 %%%%%%%%%% Section Headers %%%%%%%%%%
 
@@ -123,13 +123,16 @@
 
 		}
 
-\newcommand{\npc}[2]{\needspace{12em}\vspace{.38cm}  #1 #2 \vspace{.18cm}}
-\newcommand{\NPC}[4]{\needspace{4em}\vspace{.38cm} #1 #2
-
-\hspace{.5cm}\textbf{Personality:} #3
-
-\hspace{.5cm}\textbf{Mannerism:} #4
+%%%%% NPC Names
 
+\newcommand{\name}{}
+\newcommand{\personality}{}
+\newcommand{\mannerism}{}
+\newcommand{\npc}[2]{\renewcommand{\name}{#1 #2}}
+\newcommand{\NPC}[4]{\renewcommand{\name}{#1 #2}
+\settoggle{personality}{true}
+\renewcommand{\personality}{#3}
+\renewcommand{\mannerism}{#4}
 }
 \newcommand{\G}{\opposition} % groups
 \newcommand{\M}{\mars} % male
@@ -155,6 +158,8 @@
 
 \newtoggle{verbose}
 \settoggle{verbose}{true}
+\newtoggle{personality}
+\settoggle{personality}{false}
 
 \iftoggle{verbose}{
 	\setcounter{tocdepth}{1}
@@ -231,9 +236,8 @@ Roll & Result \\
 
 \newcommand{\story}[2]{\needspace{2em}\vspace{.3cm}\noindent\textbf{#2\ldots}\par\noindent Cost: #1\par\noindent}
 
-\newcommand{\best}[1]{\subsubsection{#1}\index{#1}}
+\newcommand{\best}[1]{\subsubsection{#1}\renewcommand{\name}{#1}\index{#1}}
 
-%%% Random Number by grabbing last page digit
 \newcounter{random}
 \setcounter{random}{1}
 \newcounter{increment}