diff --git a/mkessler-thmstyle.sty b/mkessler-thmstyle.sty
index 1ec83b4..d446f64 100644
--- a/mkessler-thmstyle.sty
+++ b/mkessler-thmstyle.sty
@@ -84,201 +84,15 @@
 
 \declarefancythmstyle[red!8]{red}[thmredmarginandfill]
 \declarefancythmstyle[orange!10]{orange}[thmorangemarginandfill]
-
 \declarefancythmstyle[blue!7]{blue}[thmbluemarginandfill]
-
-
-\mdfdefinestyle{mdgreenmargin}{%
-    skipabove =\fancythmskipabove,
-    linecolor=green!70!black,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdgoldmargin}{%
-    skipabove =\fancythmskipabove,
-    linecolor=gold,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-
-\mdfdefinestyle{mdyellowmargin}{%
-    skipabove =\fancythmskipabove,
-    linecolor=yellow!80!orange,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdgraymargin}{%
-    skipabove =\fancythmskipabove,
-    linecolor=gray,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdvioletmarginandfill}{%
-    skipabove =\fancythmskipabove,
-    linecolor=violet,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    backgroundcolor=violet!7,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdvioletmargin}{%
-    skipabove =\fancythmskipabove,
-    linecolor=violet,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdredmarginbluefill}{%
-    skipabove =\fancythmskipabove,
-    linecolor=red,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    backgroundcolor=blue!7,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdredmargin}{%
-    skipabove =\fancythmskipabove,
-    linecolor=red,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdorangemarginbluefill}{%
-    skipabove =\fancythmskipabove,
-    linecolor=orange,
-    linewidth = \fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    backgroundcolor=blue!7,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdblackmarginandfill}{%
-	skipabove=\fancythmskipabove,
-	linecolor=black,
-	linewidth=\fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-	backgroundcolor=violet!20!gray!20,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\mdfdefinestyle{mdblackmargin}{%
-	skipabove=\fancythmskipabove,
-	linecolor=black,
-	linewidth=\fancythmlinewidth,
-    leftmargin = 0cm,
-    rightmargin=0cm,
-    rightline=false,
-    topline=false,
-    bottomline=false
-}
-
-\declaretheoremstyle[
-	mdframed={style=mdorangemarginbluefill},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmorangemarginbluefill}
-
-\declaretheoremstyle[
-	mdframed={style=mdgreenmargin},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmgreenmargin}
-
-\declaretheoremstyle[
-	mdframed={style=mdgoldmargin},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmgoldmargin}
-
-\declaretheoremstyle[
-	mdframed={style=mdyellowmargin},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmyellowmargin}
-
-\declaretheoremstyle[
-	mdframed={style=mdgraymargin},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmgraymargin}
-
-\declaretheoremstyle[
-	mdframed={style=mdvioletmarginandfill},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmvioletmarginandfill}
-
-\declaretheoremstyle[
-	mdframed={style=mdredmargin},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmredmargin}
-
-\declaretheoremstyle[
-	mdframed={style=mdvioletmargin},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmvioletmargin}
-
-\declaretheoremstyle[
-	mdframed={style=mdredmarginbluefill},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmredmarginbluefill}
-
-\declaretheoremstyle[
-	mdframed={style=mdblackmarginandfill},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmblackmarginandfill}
-
-\declaretheoremstyle[
-	mdframed={style=mdblackmargin},
-	postheadspace={0.3em},
-    notefont=\mdseries
-]{thmblackmargin}
-
-
-
+\declarefancythmstyle{green!70!black}[thmgreenmargin]
+\declarefancythmstyle{gold}[thmgoldmargin]
+\declarefancythmstyle{yellow!80!orange}[thmyellowmargin]
+\declarefancythmstyle{gray}[thmgraymargin]
+\declarefancythmstyle[violet!7]{violet}[thmvioletmarginandfill]
+\declarefancythmstyle{violet}[thmvioletmargin]
+\declarefancythmstyle[blue!7]{red}[thmredmarginbluefill]
+\declarefancythmstyle{red}[thmredmargin]
+\declarefancythmstyle[blue!7]{orange}[thmorangemarginbluefill]
+\declarefancythmstyle[violet!20!gray!20]{black}[thmblackmarginandfill]
+\declarefancythmstyle{black}[thmblackmargin]