diff --git a/src/awam/__main__.py b/src/awam/__main__.py
index ce9a65f..130bb41 100644
--- a/src/awam/__main__.py
+++ b/src/awam/__main__.py
@@ -32,9 +32,9 @@ def get_tracked_task(api_token: str) -> Optional[Dict[str, Any]]:
 
 def setup_activitywatch_client() -> Tuple[ActivityWatchClient, str]:
     """Initialize ActivityWatch client and create bucket."""
-    client = ActivityWatchClient("amazing-marvin-watcher", testing=False)
-    bucket_id = f"amazing-marvin-task_{client.client_hostname}"
-    event_type = "amazing-marvin-task"
+    client = ActivityWatchClient("aw-watcher-marvin", testing=False)
+    bucket_id = f"aw-watcher-marvin_{client.client_hostname}"
+    event_type = "current-window"
 
     try:
         client.create_bucket(bucket_id, event_type=event_type)
@@ -45,16 +45,14 @@ def setup_activitywatch_client() -> Tuple[ActivityWatchClient, str]:
         sys.exit(1)
 
 
-def create_task_event(tracked_task: Optional[Dict[str, Any]]) -> Optional[Event]:
+def create_task_event(tracked_task: Dict[str, Any]) -> Event:
     """Create an ActivityWatch event from a tracked Amazing Marvin task."""
     if not tracked_task:
         return None
 
     event_data = {
-        "task_title": tracked_task.get("title", "Unknown Task"),
-        "task_id": tracked_task.get("_id", ""),
-        "database": tracked_task.get("db", "Tasks"),
         "app": "Amazing Marvin",
+        "title": tracked_task.get("title", "Unknown Task"),
     }
 
     return Event(timestamp=datetime.now(timezone.utc), data=event_data)
@@ -79,7 +77,7 @@ def main() -> None:
     print("Press Ctrl+C to stop")
 
     current_task_id = None
-    heartbeat_interval = 30  # seconds
+    heartbeat_interval = 60
 
     try:
         with client:
@@ -95,13 +93,12 @@ def main() -> None:
                         print(f"Now tracking: {task_title}")
 
                     event = create_task_event(tracked_task)
-                    if event:
-                        client.heartbeat(
-                            bucket_id,
-                            event,
-                            pulsetime=int(heartbeat_interval * 1.5),
-                            queued=True,
-                        )
+                    client.heartbeat(
+                        bucket_id,
+                        event,
+                        pulsetime=int(heartbeat_interval * 2.1),
+                        queued=True,
+                    )
                 else:
                     if current_task_id is not None:
                         current_task_id = None