diff --git a/site/.vitepress/theme/Background.vue b/site/.vitepress/theme/Background.vue
index d194e800..8ea0efaa 100644
--- a/site/.vitepress/theme/Background.vue
+++ b/site/.vitepress/theme/Background.vue
@@ -1,58 +1,34 @@
 <template>
-  <TresCanvas>
-      <TresOrthographicCamera ref="camera" :position="[0, 0, 10]" />
-      <TresGroup ref="blobRef">
-        <TresMesh v-for="i in rows * cols" :position="[((i % cols) - cols / 2) * 304, (Math.floor((i - 1) / cols) - rows / 2) * 304, 0]" >
-          <TresShapeGeometry :args="[shapes]" />
-          <TresShaderMaterial :vertexShader="vertexShader" :fragmentShader="fragmentShader" :uniforms="uniforms" :blending="AdditiveBlending" />
-        </TresMesh>
-      </TresGroup>
-      <TresAmbientLight :intensity="1" />
-  </TresCanvas>
-  <div ref="resizeListener" class="resize-listener" />
+    <TresGroup ref="groupRef" v-if="renderer">
+      <TresMesh v-for="i in rows * cols" :position="[((i % cols) - cols / 2) * 304, (Math.floor((i - 1) / cols) - rows / 2) * 304, 0]" >
+        <TresShapeGeometry :args="[shapes]" />
+        <TresShaderMaterial :vertexShader="vertexShader" :fragmentShader="fragmentShader" :uniforms="uniforms" :blending="AdditiveBlending" />
+      </TresMesh>
+    </TresGroup>
 </template>
 
 <script setup lang="ts">
-import { computed, ref, shallowRef, onMounted, onUnmounted, watch } from "vue";
-import { TresCanvas, useLoader, useRenderLoop } from '@tresjs/core';
+import { useLoader, useRenderLoop, useTresContext } from '@tresjs/core';
+import { AdditiveBlending, Group, Vector2 } from "three";
 import { SVGLoader } from "three/examples/jsm/loaders/SVGLoader.js";
+import { computed, onMounted, onUnmounted, ref, shallowRef } from "vue";
 import noise from "./noise.glsl?raw";
-import { AdditiveBlending, Vector2 } from "three";
 
-const camera = ref();
+const { renderer, sizes } = useTresContext();
 
 // Load SVG
 const { paths } = await useLoader(SVGLoader, '/circuit-board.svg');
 const shapes = paths.map(path => SVGLoader.createShapes(path)).reduce((acc, curr) => [...acc, ...curr]);
 
-// Handle canvas size
-const width = ref(0);
-const height = ref(0);
-const rows = computed(() => Math.ceil(height.value / 304));
-const cols = computed(() => Math.ceil(width.value / 304));
-const resizeObserver = new ResizeObserver(updateSize);
-const resizeListener = ref<Element | null>(null);
-function updateSize() {
-    const rect = resizeListener.value?.getBoundingClientRect();
-    width.value = rect?.width ?? 0;
-    height.value = rect?.height ?? 0;
-}
-watch([width, height, camera], ([width, height, camera]) => {
-  if (camera) {
-    camera.left = 0;
-    camera.bottom = 0
-    camera.right = width;
-    camera.top = height;
-    camera.updateProjectionMatrix();
-  }
-});
+const rows = computed(() => Math.ceil(sizes.height.value / 304));
+const cols = computed(() => Math.ceil(sizes.width.value / 304));
 
 // Handle mouse position
 const mousePos = ref(new Vector2(Infinity, Infinity));
 function updateMousePos(event: MouseEvent) {
   mousePos.value = new Vector2(event.screenX, window.screen.availHeight - event.screenY);
-  if (blobRef.value) {
-    blobRef.value.children.forEach(child => {
+  if (groupRef.value) {
+    groupRef.value.children.forEach(child => {
       child.material.uniforms.uMouse.value = mousePos.value;
     });
   }
@@ -60,8 +36,8 @@ function updateMousePos(event: MouseEvent) {
 function handleMouseLeave(event: MouseEvent) {
   if (!event.relatedTarget) {
     mousePos.value = new Vector2(Infinity, Infinity);
-    if (blobRef.value) {
-      blobRef.value.children.forEach(child => {
+    if (groupRef.value) {
+      groupRef.value.children.forEach(child => {
         child.material.uniforms.uMouse.value = mousePos.value;
       });
     }
@@ -70,19 +46,16 @@ function handleMouseLeave(event: MouseEvent) {
 
 // Setup window listeners
 onMounted(() => {
-    if (resizeListener.value != null) {
-        resizeObserver.observe(resizeListener.value);
-    }
-    window.addEventListener("mousemove", updateMousePos);
-    window.addEventListener("mouseout", handleMouseLeave);
+  window.addEventListener("mousemove", updateMousePos);
+  window.addEventListener("mouseout", handleMouseLeave);
 });
 onUnmounted(() => {
-    window.removeEventListener("mousemove", updateMousePos);
-    window.removeEventListener("mouseout", handleMouseLeave);
+  window.removeEventListener("mousemove", updateMousePos);
+  window.removeEventListener("mouseout", handleMouseLeave);
 });
 
 // Shaders
-const blobRef = shallowRef<Element | null>(null);
+const groupRef = shallowRef<Group | null>(null);
 
 const uniforms = {
   uTime: { value: 0 },
@@ -98,8 +71,7 @@ void main() {
   gl_Position = projectionMatrix * viewPosition;
   vUv = uv;
 }
-`
-
+`;
 const fragmentShader = noise + `
 precision mediump float;
 uniform float uTime;
@@ -112,26 +84,14 @@ void main() {
   alpha += max(0., snoise(vec3(gl_FragCoord.xy / 304., uTime / 4.)));
   gl_FragColor = vec4(0, 0, 0, alpha);
 }
-`
-const { onLoop } = useRenderLoop();
+`;
 
+const { onLoop } = useRenderLoop();
 onLoop(({ elapsed }) => {
-  if (blobRef.value) {
-    blobRef.value.children.forEach(child => {
+  if (groupRef.value) {
+    groupRef.value.children.forEach(child => {
       child.material.uniforms.uTime.value = elapsed;
     });
   }
 });
 </script>
-
-<style scoped>
-.resize-listener {
-  position: absolute;
-  top: 0px;
-  left: 0;
-  right: -4px;
-  bottom: 5px;
-  z-index: -10;
-  pointer-events: none;
-}
-</style>
diff --git a/site/.vitepress/theme/Camera.vue b/site/.vitepress/theme/Camera.vue
new file mode 100644
index 00000000..58eb01e6
--- /dev/null
+++ b/site/.vitepress/theme/Camera.vue
@@ -0,0 +1,21 @@
+<template>
+    <TresOrthographicCamera :position="[0, 0, 10]" />
+</template>
+
+<script setup lang="ts">
+import { useTresContext } from '@tresjs/core';
+import { OrthographicCamera } from 'three';
+import { watch } from "vue";
+
+const context = useTresContext();
+watch([context.sizes.width, context.sizes.height, context.camera], ([width, height, camera]) => {
+    const cam = camera as OrthographicCamera;
+    if (cam) {
+        cam.left = 0;
+        cam.bottom = 0
+        cam.right = width;
+        cam.top = height;
+        cam.updateProjectionMatrix();
+    }
+});
+</script>
diff --git a/site/.vitepress/theme/Layout.vue.in b/site/.vitepress/theme/Layout.vue.in
index d1043a48..c9453607 100644
--- a/site/.vitepress/theme/Layout.vue.in
+++ b/site/.vitepress/theme/Layout.vue.in
@@ -3,11 +3,15 @@
     <template #layout-top>
       <NolebaseHighlightTargetedHeading />
       <ClientOnly>
-        <Suspense>
-          <div class="background">
-            <Background />
-          </div>
-        </Suspense>
+        <div class="background">
+          <TresCanvas>
+            <Camera />
+            <TresAmbientLight :intensity="1" />
+            <Suspense>
+              <Background />
+            </Suspense>
+          </TresCanvas>
+        </div>
       </ClientOnly>
     </template>
     <template #layout-bottom>
@@ -22,11 +26,14 @@
 </template>
 
 <script setup lang="tsx">
-import DefaultTheme from 'vitepress/theme'
 import { NolebaseHighlightTargetedHeading } from '@nolebase/vitepress-plugin-highlight-targeted-heading/client'
+import { TresCanvas } from '@tresjs/core'
 import '@nolebase/vitepress-plugin-highlight-targeted-heading/client/style.css'
-import './custom.css'
+import DefaultTheme from 'vitepress/theme'
 import Background from './Background.vue'
+import Camera from './Camera.vue'
+import OrbitControls from './OrbitControls.vue'
+import './custom.css'
 </script>
 
 <style scoped>
diff --git a/site/.vitepress/theme/OrbitControls.vue b/site/.vitepress/theme/OrbitControls.vue
index 3215c236..3db6c759 100644
--- a/site/.vitepress/theme/OrbitControls.vue
+++ b/site/.vitepress/theme/OrbitControls.vue
@@ -12,16 +12,3 @@ import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
 extend({ OrbitControls });
 const { camera, renderer } = useTresContext();
 </script>
-
-<style scoped>
-.background {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-    overflow: hidden;
-}
-</style>
-    
\ No newline at end of file