diff --git a/apuntsfme.dtx b/apuntsfme.dtx
index f209ba4..6682409 100644
--- a/apuntsfme.dtx
+++ b/apuntsfme.dtx
@@ -166,7 +166,6 @@
 \RequirePackage[utf8]{inputenc}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{lmodern}
-\RequirePackage{hyperref}
 \RequirePackage[shortlabels]{enumitem}
 \RequirePackage{amsmath,amsthm,amssymb,graphicx,mathtools,tikz,makeidx}
 \RequirePackage{cancel,pgf,pgfplots,mathrsfs,thmtools,tikz-cd,faktor}
@@ -184,7 +183,8 @@
 \RequirePackage{needspace} %No se si es gaire util, compila sense incloure'l
 \RequirePackage{commath} % Aquest implement els \dif, cal canviar tot el codi per ferho amb physics
 \RequirePackage{dsfont} % No se que fa, compila si el trec
-\RequirePackage{mdframed,cleveref,stackengine,stmaryrd,multirow}
+\RequirePackage{mdframed,stackengine,stmaryrd,multirow}
+\RequirePackage{hyperref, cleveref}
 %    \end{macrocode}
 %
 %
@@ -602,7 +602,7 @@
 \RequirePackage[utf8]{inputenc}
 \RequirePackage[T1]{fontenc}
 \RequirePackage{lmodern}
-\RequirePackage{graphicx,physics}
+\RequirePackage{graphicx}
 %    \end{macrocode}
 %
 % \subsection{Language}
@@ -630,6 +630,7 @@
     \renewcommand*{\@titlemonth}{\ifcase \the\month \or Enero\or Febrero\or Marzo\or Abril\or Mayo \or Junio\or Julio\or Agosto\or Septiembre\or Octubre\or Noviembre\or Diciembre\fi \:  \number \year}
 }
 
+\newif\if@puntvolat\@puntvolatfalse
 \DeclareOption{catalan}{
     \renewcommand*{\languagename}{catalan}
     \renewcommand*{\@authortext}{Autor}
@@ -640,6 +641,7 @@
     \renewcommand*{\@reviewertext}{Revisors}
     \renewcommand*{\@lastupdatetext}{\'Ultima modificaci\'o}
     \renewcommand*{\@titlemonth}{\ifcase \the\month \or Gener\or Febrer\or Mar\c{c}\or Abril\or Maig \or Juny\or Juliol\or Agost\or Setembre\or Octubre\or Novembre\or Desembre\fi \:  \number \year}
+    \@puntvolattrue
 }
 %    \end{macrocode}
 %
@@ -845,10 +847,11 @@
 % \end{macro}
 %
 % \subsection{Other includes}
-% These packages need to be included last, so we place them here. TODO remove doclicense
+% These packages need to be included last, so we place them here. The hyperref
+% package is included as late as possible. TODO remove doclicense
 %    \begin{macrocode}
 \RequirePackage[a4paper,margin=1in]{geometry}
-\RequirePackage{hyperref}
+\AtBeginDocument{\RequirePackage{hyperref}}
 \RequirePackage[
     type={CC},
     modifier={by-nc-sa},
@@ -859,48 +862,50 @@
 % \subsection{Parche punt volat}
 
 %Definició de la ela geminada per tal que accepti el punt volat del teclat
-\def·#1{%
-  \ifmmode
-    \cdot #1
+\if@puntvolat
+    \def·#1{%
+        \ifmmode
+            \cdot #1
     %\csname normal@char\string"\endcsname l%
-  \else%
-    \def\argument{#1}%
-    \if\argument l%
-      \leftllkern=0pt\rightllkern=0pt\raiselldim=0pt%
-      \setbox0\hbox{l}\setbox1\hbox{l\/}\setbox2\hbox{.}%
-      \advance\raiselldim by \the\fontdimen5\the\font
-      \advance\raiselldim by -\ht2%
-      \leftllkern=-.5\wd0%
-      \advance\leftllkern by \wd1%
-      \advance\leftllkern by -\wd0%
-      \rightllkern=-.5\wd0%
-      \advance\rightllkern by -\wd1%
-      \advance\rightllkern by \wd0%
-      \allowhyphens\discretionary{-}{l}%
-      {\hbox{}\kern\leftllkern\raise\raiselldim\hbox{.}%
-        \kern\rightllkern\hbox{l}}\allowhyphens%
-    \else
-      \if\argument L%
-        \leftllkern=0pt\rightllkern=0pt\raiselldim=0pt%
-        \setbox0\hbox{L}\setbox1\hbox{L\/}\setbox2\hbox{.}%
-        \advance\raiselldim by .5\ht0%
-        \advance\raiselldim by -.5\ht2%
-        \leftllkern=-.5\wd0%
-        \advance\leftllkern by \wd1%
-        \advance\leftllkern by -\wd0%
-        \rightllkern=.375\wd0%
-        \divide\rightllkern by 6%
-        \advance\rightllkern by -\wd1%
-        \advance\rightllkern by \wd0%
-        \allowhyphens\discretionary{-}{L}%
-        {\hbox{}\kern\leftllkern\raise\raiselldim\hbox{.}%
-           \kern\rightllkern\hbox{L}}\allowhyphens%
-      \else
-        #1
-      \fi
-    \fi
-  \fi
-  } 
+        \else%
+            \def\argument{#1}%
+            \if\argument l%
+                \leftllkern=0pt\rightllkern=0pt\raiselldim=0pt%
+                \setbox0\hbox{l}\setbox1\hbox{l\/}\setbox2\hbox{.}%
+                \advance\raiselldim by \the\fontdimen5\the\font
+                \advance\raiselldim by -\ht2%
+                \leftllkern=-.5\wd0%
+                \advance\leftllkern by \wd1%
+                \advance\leftllkern by -\wd0%
+                \rightllkern=-.5\wd0%
+                \advance\rightllkern by -\wd1%
+                \advance\rightllkern by \wd0%
+                \allowhyphens\discretionary{-}{l}%
+                {\hbox{}\kern\leftllkern\raise\raiselldim\hbox{.}%
+                \kern\rightllkern\hbox{l}}\allowhyphens%
+            \else
+                \if\argument L%
+                    \leftllkern=0pt\rightllkern=0pt\raiselldim=0pt%
+                    \setbox0\hbox{L}\setbox1\hbox{L\/}\setbox2\hbox{.}%
+                    \advance\raiselldim by .5\ht0%
+                    \advance\raiselldim by -.5\ht2%
+                    \leftllkern=-.5\wd0%
+                    \advance\leftllkern by \wd1%
+                    \advance\leftllkern by -\wd0%
+                    \rightllkern=.375\wd0%
+                    \divide\rightllkern by 6%
+                    \advance\rightllkern by -\wd1%
+                    \advance\rightllkern by \wd0%
+                    \allowhyphens\discretionary{-}{L}%
+                    {\hbox{}\kern\leftllkern\raise\raiselldim\hbox{.}%
+                    \kern\rightllkern\hbox{L}}\allowhyphens%
+                \else
+                    #1
+                \fi
+            \fi
+        \fi
+    } 
+\fi
 
 % \iffalse
 %</class>