diff --git a/nvim/ultisnips/tex.snippets b/nvim/ultisnips/tex.snippets
index 479ae9f..d69501d 100644
--- a/nvim/ultisnips/tex.snippets
+++ b/nvim/ultisnips/tex.snippets
@@ -546,7 +546,7 @@ snippet pmat "Paren Matrix" iA
 endsnippet
 
 context "math()"
-snippet bmat "Bracket Matrix" iA
+snippet matr "Bracket Matrix" iA
 \begin{bmatrix} $1 \end{bmatrix} $0
 endsnippet
 
@@ -744,7 +744,7 @@ snippet nn "Tikz node" w
 $0
 endsnippet
 
-snippet problem "Problem" iA
+snippet problem "Problem" biA
 \pbl{$1}
     $0
 endsnippet
@@ -801,7 +801,7 @@ snippet impc "Import Code" wA
 \begin{listing}[${1:H}]
     \caption{$2}
     \label{lst:$3}
-    \importcode{$1}{$2}$0
+    \importcode{$4}{$5}$0
 \end{listing}
 endsnippet
 
diff --git a/tex/booknotes.cls b/tex/booknotes.cls
index f3b7b2b..619226d 100644
--- a/tex/booknotes.cls
+++ b/tex/booknotes.cls
@@ -177,11 +177,12 @@
 \definecolor{MintedBg}{RGB}{38, 38, 38}
 
 
-\newenvironment{code}[1]{\color{white}\VerbatimEnvironment\begin{minted}[bgcolor=MintedBg]{#1}}{\end{minted}}
 
-\newcommand{\inlinecode}[2]{\color{white}\mintinline[bgcolor=MintedBg]{#1}|#2|}
+\newenvironment{code}[1]{\color{white}\VerbatimEnvironment\begin{minted}[breaklines, bgcolor=MintedBg]{#1}}{\end{minted}}
 
-\newcommand{\importcode}[2]{\color{white}\VerbatimEnvironment\inputminted[bgcolor=MintedBg]{#1}{#2}}
+\newcommand{\inlinecode}[2]{\color{white}\mintinline[breaklines, bgcolor=MintedBg]{#1}|#2|}
+
+\newcommand{\importcode}[2]{\color{white}\inputminted[breaklines, bgcolor=MintedBg]{#1}{#2}}
 
 \DeclareMathOperator{\GL}{GL}
 \DeclareMathOperator{\Imm}{Im}
diff --git a/tex/handout.cls b/tex/handout.cls
index 049dbe0..26cf5cc 100644
--- a/tex/handout.cls
+++ b/tex/handout.cls
@@ -182,11 +182,11 @@
 
 \newcommand{\toc}{\tableofcontents\raggedbottom}
 
-\newenvironment{code}[1]{\color{white}\VerbatimEnvironment\begin{minted}[bgcolor=MintedBg]{#1}}{\end{minted}}
+\newenvironment{code}[1]{\color{white}\VerbatimEnvironment\begin{minted}[breaklines, bgcolor=MintedBg]{#1}}{\end{minted}}
 
-\newcommand{\inlinecode}[2]{\color{white}\mintinline[bgcolor=MintedBg]{#1}|#2|}
+\newcommand{\inlinecode}[2]{\color{white}\mintinline[breaklines, bgcolor=MintedBg]{#1}|#2|}
 
-\newcommand{\importcode}[2]{\color{white}\VerbatimEnvironment\inputminted[bgcolor=MintedBg]{#1}{#2}}
+\newcommand{\importcode}[2]{\color{white}\inputminted[breaklines, bgcolor=MintedBg]{#1}{#2}}
 
 \DeclareMathOperator{\GL}{GL}
 \DeclareMathOperator{\Imm}{Im}
diff --git a/tex/notes.cls b/tex/notes.cls
index 1101033..c0ad13f 100644
--- a/tex/notes.cls
+++ b/tex/notes.cls
@@ -182,11 +182,12 @@
 \definecolor{MintedBg}{RGB}{38, 38, 38}
 
 
-\newenvironment{code}[1]{\color{white}\VerbatimEnvironment\begin{minted}[bgcolor=MintedBg]{#1}}{\end{minted}}
+\newenvironment{code}[1]{\color{white}\VerbatimEnvironment\begin{minted}[breaklines, bgcolor=MintedBg]{#1}}{\end{minted}}
 
-\newcommand{\inlinecode}[2]{\color{white}\mintinline[bgcolor=MintedBg]{#1}|#2|}
+\newcommand{\inlinecode}[2]{\color{white}\mintinline[breaklines, bgcolor=MintedBg]{#1}|#2|}
+
+\newcommand{\importcode}[2]{\color{white}\inputminted[breaklines, bgcolor=MintedBg]{#1}{#2}}
 
-\newcommand{\importcode}[2]{\color{white}\VerbatimEnvironment\inputminted[bgcolor=MintedBg]{#1}{#2}}
 
 \DeclareMathOperator{\GL}{GL}
 \DeclareMathOperator{\Imm}{Im}
diff --git a/tex/simplebooknotes.cls b/tex/simplebooknotes.cls
index 4b03857..d90548c 100644
--- a/tex/simplebooknotes.cls
+++ b/tex/simplebooknotes.cls
@@ -142,11 +142,12 @@
     \import{./figures/}{#1.pdf_tex}
 }
 
-\newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos]{#1}}{\end{minted}}
+
+\newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}}
 
 \newcommand{\inlinecode}[2]{\mintinline{#1}|#2|}
 
-\newcommand{\importcode}[2]{\VerbatimEnvironment\inputminted[frame=lines, framesep=7pt, linenos]{#1}{#2}}
+\newcommand{\importcode}[2]{\inputminted[frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}}
 
 \DeclareMathOperator{\GL}{GL}
 \DeclareMathOperator{\Imm}{Im}
diff --git a/tex/simplenotes.cls b/tex/simplenotes.cls
index 321c297..bf3e544 100644
--- a/tex/simplenotes.cls
+++ b/tex/simplenotes.cls
@@ -148,11 +148,12 @@
     \import{./figures/}{#1.pdf_tex}
 }
 
-\newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos]{#1}}{\end{minted}}
+\newenvironment{code}[1]{\VerbatimEnvironment\begin{minted}[frame=lines,framesep=7pt, linenos, breaklines]{#1}}{\end{minted}}
 
 \newcommand{\inlinecode}[2]{\mintinline{#1}|#2|}
 
-\newcommand{\importcode}[2]{\VerbatimEnvironment\inputminted[frame=lines, framesep=7pt, linenos]{#1}{#2}}
+\newcommand{\importcode}[2]{\inputminted[frame=lines, framesep=7pt, linenos, breaklines]{#1}{#2}}
+
 
 \DeclareMathOperator{\GL}{GL}
 \DeclareMathOperator{\Imm}{Im}