diff --git a/Project.toml b/Project.toml
index 1149e96..857d738 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "GenieFramework"
 uuid = "a59fdf5c-6bf0-4f5d-949c-a137c9e2f353"
 authors = ["Adrian Salceanu <adrian.salceanu@gmail.com> and contributors"]
-version = "1.26.5"
+version = "1.26.6"
 
 [deps]
 GarishPrint = "b0ab02a7-8576-43f7-aa76-eaa7c3897c54"
@@ -17,13 +17,13 @@ StippleUI = "a3c5d34a-b254-4859-a8fa-b86abb7e84a3"
 
 [compat]
 GarishPrint = "0.5"
-Genie = "5.23.5"
-GenieAutoReload = "2"
+Genie = "5.23.6"
+GenieAutoReload = "2.2.2"
 GenieDevTools = "2.8.1"
 GeniePackageManager = "1.0.1"
 Reexport = "1"
 Revise = "3"
-Stipple = "0.27.13"
+Stipple = "0.27.24"
 StipplePlotly = "0.13.11"
 StippleUI = "0.22.8"
 julia = "1.6"
diff --git a/src/GenieFramework.jl b/src/GenieFramework.jl
index f9ec5ee..7ccdfaa 100644
--- a/src/GenieFramework.jl
+++ b/src/GenieFramework.jl
@@ -84,11 +84,7 @@ macro genietools()
         GeniePackageManager.register_routes()
         Stipple.deps!(GenieAutoReload, GenieAutoReload.deps)
 
-        @async begin
-          autoreload(pwd())
-          sleep(2)
-          Genie.Watch.watch()
-        end |> errormonitor
+        @async autoreload(pwd()) |> errormonitor
 
         if ! haskey(ENV, "GENIE_PUSH_ERRORS") || ENV["GENIE_PUSH_ERRORS"] !== "false"
           @async begin
@@ -110,7 +106,7 @@ macro genietools()
       nothing
     end
 
-    if ! isdefined(Main, :GENIE_TOOLS_LOADED)
+    if ! isdefined($__module__, :GENIE_TOOLS_LOADED)
       const GENIE_TOOLS_LOADED = true
       @info "Loading GenieTools"