diff --git a/layout.sty b/layout.sty
index 220b47cde127c2f97ebd05f22cbcb6877ad7571f..5e20a5b5f33ae9d279823696848c7b943395fd2b 100644
--- a/layout.sty
+++ b/layout.sty
@@ -411,12 +411,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 }
 
 
-\newtcolorbox{boxtext}[1][]{
-	ornamented,
-	colback=white,
-	code={\needspace{1em}}
-	fonttitle=\scshape,
-	#1}
+\newtcolorbox{boxtext}[1][]{ornamented,colback=white,fonttitle=\scshape, #1}
 
 \newcommand{\sidebox}[2][23]{
 	\iftoggle{verbose}{
@@ -681,13 +676,32 @@ Roll & Result \\
 \newcommand{\li}{\addtocounter{enc}{-1}\arabic{enc}&}
 \newcommand{\lii}{\addtocounter{list}{-1}\arabic{list}&}
 
+\newtcolorbox{boxtable}[1][c|X]{
+	tabularx={#1},
+	top=10pt,
+	bottom=10pt,
+	left=3pt,
+	right=3pt,
+	code={\rowcolors{2}{}{gray!10}\needspace{2em}}
+	}
+
+\newtcolorbox{nametable}[2][cX]{
+	tabularx={#1},
+	top=10pt,
+	adjusted title=#2,
+	bottom=10pt,
+	left=3pt,
+	right=3pt,
+	code={\rowcolors{2}{}{gray!10}\needspace{1em}}
+	}
+
 \newtcolorbox{rollchart}{
-	tabularx={p{.25\linewidth}X},
+	tabularx={cX},
 	top=10pt,
 	bottom=10pt,
 	left=3pt,
 	right=3pt,
-	code={\rowcolors{2}{}{gray!10}}
+	code={\rowcolors{2}{}{gray!10}\needspace{2em}}
 	}
 
 \newtcolorbox{xpbox}[1]{