diff --git a/src/dependencies.pug b/src/dependencies.pug
index a7dbb83..08b9d09 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -15,10 +15,9 @@ if themeChecker
     link(rel='stylesheet', href='https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/nano.min.css')
 
 if endpoints.get
-  //- Disabled - Not in core@0.15
-  //- if endpoints.get.events && endpoints.get.typeevents
-  //-   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.4" defer)
-    //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer)
+  if endpoints.get.events && endpoints.get.typeevents
+    script(type="module", src="https://cdn.skypack.dev/@startinblox/component-event@2.1", defer)
+    //- script(type="module", src="/lib/solid-event/solid-event.js", defer)
 
   //- Disabled - Not in core@0.15
   //- if endpoints.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes
diff --git a/src/index.pug b/src/index.pug
index 4eaad95..fde12e7 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -105,7 +105,7 @@ html(lang="en")
                 include views/page-polls.pug
 
           if endpoints.get.events
-            #events(hidden, data-view="events")
+            #events(hidden, data-view="events").scrollbar-content.bg-color-white
               include views/page-events.pug
 
           if endpoints.get.resources
diff --git a/src/views/page-events.pug b/src/views/page-events.pug
index 22f2b8a..0029735 100644
--- a/src/views/page-events.pug
+++ b/src/views/page-events.pug
@@ -1,7 +1,7 @@
-.views-container
-  solid-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}`
-            range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
-            range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
-            upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
-            id-prefix='default'
-  )
\ No newline at end of file
+div.whitespace-normal
+  solid-event(data-src=`${endpoints.events || endpoints.get.events}`
+    range-event-type=`${endpoints.typeevents || endpoints.get.typeevents}`
+    range-event-circle=`${endpoints.circles || endpoints.get.circles}`
+    upload-dir=`${endpoints.uploads || endpoints.get.uploads}`
+    id-prefix='default'
+  )