diff --git a/gulpfile.ts b/gulpfile.ts
index 76a0aa9..2665b1e 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -152,6 +152,8 @@ export async function Build()
     if (settings.Watch)
     {
         log.info(watchStartMessage);
+        gulp.watch(settings.ThemeSource("**"), Theme);
+        gulp.watch(settings.TemplateSource("**"), Templates);
     }
 
     await Promise.all(
@@ -230,7 +232,7 @@ export async function Library()
                             buffer()
                         ).pipe(
                             gulpIf(
-                                settings.Debug,
+                                !settings.Debug,
                                 terser()
                             )
                         ).pipe(