diff --git a/.gitignore b/.gitignore
index edd9d60..779d236 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 build/
 dist/
+.*
+*.egg-info
diff --git a/pyproject.toml b/pyproject.toml
index ea88bca..7337833 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,9 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyscript_stubs"
-version = "0.0.1"
+version = "0.0.2"
 authors = [
   { name="Greger Stolt Nilsen", email="gregersn@gmail.com" },
+  { name="Jos Verlinde", email="jos_verlinde@hotmail.com" },
 ]
 description = "Typing stubs for Pyscript"
 readme = "README.md"
@@ -14,9 +15,18 @@ requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
-    "License :: OSI Approved :: MIT License",
 ]
-
+license = "MIT AND Apache-2.0"
 [project.urls]
-Homepage = "https://github.com/gregersn/pyscript-stubs"
-Issues = "https://github.com/gregersn/pyscript-stubs/issues"
\ No newline at end of file
+Homepage = "https://github.com/pyscript/pyscript-stubs"
+Issues = "https://github.com/pyscript/pyscript-stubs/issues"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["pyscript*"]
+
+[tool.setuptools.package-data]
+pyscript = ["**/*.pyi"]
\ No newline at end of file
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..3dcd31f
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,10 @@
+# PyScript Stubs
+
+Because there is no `pyscript` package to install in the Python environment
+used by your IDE, there are no type hints for the IDE to use for code
+analysis while coding a PyScript project.
+
+This project contains [stub files](https://typing.python.org/en/latest/spec/distributing.html#stub-files)
+for PyScript and related projects (for example, MicroPython).
+
+It is a work in progress.
diff --git a/src/pyscript-stubs/node.pyi b/src/pyscript-stubs/node.pyi
deleted file mode 100644
index 2505ea8..0000000
--- a/src/pyscript-stubs/node.pyi
+++ /dev/null
@@ -1,23 +0,0 @@
-from typing import Optional
-from .base import EventTarget
-from .document_class import Document
-from .element import Element
-
-class Node(EventTarget):
-    baseURI: str
-    childNodes: list['Node']
-    firstChild: 'Node'
-    isConnected: bool
-    lastChild: 'Node'
-    nextSibling: 'Node'
-    nodeName: str
-    nodeType: int
-    nodeValue: any
-    ownerDocument: 'Document'
-    parentNode: Optional['Node']
-    parentElement: Optional['Element']
-    previousSibling: Optional['Node']
-    textContent: str
-
-    def appendChild(self, childNode: 'Node'): ...
-    def cloneNode(self) -> 'Node': ...
\ No newline at end of file
diff --git a/src/pyscript-stubs/__init__.pyi b/src/pyscript-stubs/pre-existing/__init__.pyi
similarity index 100%
rename from src/pyscript-stubs/__init__.pyi
rename to src/pyscript-stubs/pre-existing/__init__.pyi
diff --git a/src/pyscript-stubs/base.pyi b/src/pyscript-stubs/pre-existing/base.pyi
similarity index 87%
rename from src/pyscript-stubs/base.pyi
rename to src/pyscript-stubs/pre-existing/base.pyi
index 11297c4..7607ef6 100644
--- a/src/pyscript-stubs/base.pyi
+++ b/src/pyscript-stubs/pre-existing/base.pyi
@@ -1,7 +1,7 @@
 class CSSStyleDeclaration:
     display: str
 
-class EventTarget():
+class EventTarget:
     def addEventListener(self): ...
     def removeEventListener(self): ...
     def dispatchEvent(self): ...
diff --git a/src/pyscript-stubs/document_class.pyi b/src/pyscript-stubs/pre-existing/document_class.pyi
similarity index 100%
rename from src/pyscript-stubs/document_class.pyi
rename to src/pyscript-stubs/pre-existing/document_class.pyi
diff --git a/src/pyscript-stubs/element.pyi b/src/pyscript-stubs/pre-existing/element.pyi
similarity index 73%
rename from src/pyscript-stubs/element.pyi
rename to src/pyscript-stubs/pre-existing/element.pyi
index 69d5d8a..07a03ee 100644
--- a/src/pyscript-stubs/element.pyi
+++ b/src/pyscript-stubs/pre-existing/element.pyi
@@ -2,10 +2,8 @@ from . import CSSStyleDeclaration
 from node import Node
 
 class Element(Node):
-     classList: list[str]
-     onclick: callable
-
+    classList: list[str]
+    onclick: callable
 
 class HTMLElement(Element):
     style: CSSStyleDeclaration
-
diff --git a/src/pyscript-stubs/pre-existing/node.pyi b/src/pyscript-stubs/pre-existing/node.pyi
new file mode 100644
index 0000000..15f9f2c
--- /dev/null
+++ b/src/pyscript-stubs/pre-existing/node.pyi
@@ -0,0 +1,23 @@
+from typing import Optional
+from .base import EventTarget
+from .document_class import Document
+from .element import Element
+
+class Node(EventTarget):
+    baseURI: str
+    childNodes: list["Node"]
+    firstChild: "Node"
+    isConnected: bool
+    lastChild: "Node"
+    nextSibling: "Node"
+    nodeName: str
+    nodeType: int
+    nodeValue: any
+    ownerDocument: "Document"
+    parentNode: Optional["Node"]
+    parentElement: Optional["Element"]
+    previousSibling: Optional["Node"]
+    textContent: str
+
+    def appendChild(self, childNode: "Node"): ...
+    def cloneNode(self) -> "Node": ...
diff --git a/src/pyscript-stubs/py.typed b/src/pyscript-stubs/pre-existing/py.typed
similarity index 100%
rename from src/pyscript-stubs/py.typed
rename to src/pyscript-stubs/pre-existing/py.typed
diff --git a/src/pyscript-stubs/window_class.pyi b/src/pyscript-stubs/pre-existing/window_class.pyi
similarity index 91%
rename from src/pyscript-stubs/window_class.pyi
rename to src/pyscript-stubs/pre-existing/window_class.pyi
index a75de2f..862f8e5 100644
--- a/src/pyscript-stubs/window_class.pyi
+++ b/src/pyscript-stubs/pre-existing/window_class.pyi
@@ -13,4 +13,4 @@ class FileReader(EventTarget):
 class Window(EventTarget):
     console: Console
     FileReader: FileReader
-    location: Location
\ No newline at end of file
+    location: Location
diff --git a/src/pyscript-stubs/pyscript/__init__.pyi b/src/pyscript-stubs/pyscript/__init__.pyi
new file mode 100644
index 0000000..4e7a204
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/__init__.pyi
@@ -0,0 +1,61 @@
+"""
+PyScript makes available convenience objects, functions and attributes.
+
+These APIs will work with both Pyodide and MicroPython in exactly the same way.
+
+PyScript can run in two contexts: the main browser thread, or on a web worker. T
+he following three categories of API functionality explain features that are common for:
+ - both main thread and worker, 
+ - main thread only, 
+ - and worker only. 
+ 
+ Most features work in both contexts in exactly the same manner, but please be aware that some are specific to either the main thread 
+ or a worker context.
+
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+__all__ = [
+    "PyWorker",
+    "config",
+    "current_target",
+    "display",
+    "document",
+    "fetch",
+    "js_import",
+    "js_modules",
+    "py_import",
+    "storage",
+    "sync",
+    "window",
+    "workers",
+    "HTML", 
+    "Event", 
+    "WebSocket", 
+    "create_named_worker"
+]
+
+
+from polyscript import lazy_py_modules as py_import  # type: ignore
+from pyscript.display import HTML as HTML, display as display
+from pyscript.events import Event as Event, when as when
+from pyscript.fetch import fetch as fetch
+from pyscript.magic_js import (
+    RUNNING_IN_WORKER as RUNNING_IN_WORKER,
+    PyWorker as PyWorker,
+    config as config,
+    current_target as current_target,
+    document as document,
+    js_import as js_import,
+    sync as sync,
+    window as window,
+    js_modules as js_modules
+)
+
+from pyscript.storage import Storage as Storage, storage as storage
+from pyscript.websocket import WebSocket as WebSocket
+from pyscript.workers import create_named_worker as create_named_worker, workers as workers
+
+if not RUNNING_IN_WORKER:
+    ...
diff --git a/src/pyscript-stubs/pyscript/_pyscript.pyi b/src/pyscript-stubs/pyscript/_pyscript.pyi
new file mode 100644
index 0000000..b47d1aa
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/_pyscript.pyi
@@ -0,0 +1,39 @@
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Callable
+from _typeshed import Incomplete
+
+def js_import(name: str) -> JSModule:
+    """Module level __getattr__ that returns an JSModule object for any requested attribute."""
+    ...
+
+class JSModule:
+    def __init__(self, name) -> None: ...
+    def __getattr__(self, field) -> Any | None: ...
+
+class Worker:
+    async def sync(self) -> Callable: ...
+
+class XWorker(Worker):
+    # https://pyscript.github.io/polyscript/#xworker-options
+
+    polyfill: bool = False
+    window: Incomplete = ...
+
+    def __init__(
+        self,
+        file: str,
+        a_sync: bool = True,
+        config: str = "",
+        type: str = "pyodide",  #  pyodide, micropython, ruby-wasm-wasi, wasmoon, webr
+        version: str = ...,
+        serviceWorker: str = ...,
+    ) -> None: ...
+
+    # def isWindowProxy(self, ref:Incomplete) -> bool: ...
+
+class PyWorker(XWorker):
+    def __init__(self, name) -> None: ...
+
+xworker: XWorker = ...
diff --git a/src/pyscript-stubs/pyscript/display.pyi b/src/pyscript-stubs/pyscript/display.pyi
new file mode 100644
index 0000000..474f646
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/display.pyi
@@ -0,0 +1,34 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+_MIME_METHODS = ...
+_MIME_RENDERERS = ...
+
+class HTML:
+    """
+    Wrap a string so that display() can render it as plain HTML
+    """
+    def __init__(self, html) -> None: ...
+
+def display(*values, target=None, append: bool = True) -> None:
+    """
+    A function used to display content. The function is intelligent enough to introspect the object[s] it is passed and work out how to correctly
+    display the object[s] in the web page based on the following mime types::
+        - text/plain to show the content as text
+        - text/html to show the content as HTML
+        - image/png to show the content as <img>
+        - image/jpeg to show the content as <img>
+        - image/svg+xml to show the content as <svg>
+        - application/json to show the content as JSON
+        - application/javascript to put the content in <script> (discouraged)
+
+
+    The display function takes a list of *values as its first argument, and has two optional named arguments::
+        - target=None - the DOM element into which the content should be placed. If not specified, the target will use the current_script() returned id and populate the related dedicated node to show the content.
+        - append=True - a flag to indicate if the output is going to be appended to the target.
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/events.pyi b/src/pyscript-stubs/pyscript/events.pyi
new file mode 100644
index 0000000..1ebd542
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/events.pyi
@@ -0,0 +1,48 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+class Event:
+    """
+    Represents something that may happen at some point in the future.
+    """
+
+    def __init__(self) -> None: ...
+    def trigger(self, result) -> None:
+        """
+        Trigger the event with a result to pass into the handlers.
+        """
+        ...
+
+    def add_listener(self, listener) -> None:
+        """
+        Add a callable/awaitable to listen to when this event is triggered.
+        """
+        ...
+
+    def remove_listener(self, *args) -> None:
+        """
+        Clear the specified handler functions in *args. If no handlers
+        provided, clear all handlers.
+        """
+        ...
+
+def when(
+    target, *args, **kwargs
+):  #  -> _Wrapped[Callable[..., Any], Any, Callable[..., Any], CoroutineType[Any, Any, Any]] | Callable[..., _Wrapped[Callable[..., Any], Any, Callable[..., Any], CoroutineType[Any, Any, Any]]]:
+    """
+    Add an event listener to the target element(s) for the specified event type.
+
+    The target can be a string representing the event type, or an Event object.
+    If the target is an Event object, the event listener will be added to that
+    object. If the target is a string, the event listener will be added to the
+    element(s) that match the (second) selector argument.
+
+    If a (third) handler argument is provided, it will be called when the event
+    is triggered; thus allowing this to be used as both a function and a
+    decorator.
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/fetch.pyi b/src/pyscript-stubs/pyscript/fetch.pyi
new file mode 100644
index 0000000..563a8aa
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/fetch.pyi
@@ -0,0 +1,167 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Awaitable
+
+class _Response:
+    """
+    Response wrapper class for fetch API responses.
+
+    Wraps the JavaScript Response object and provides methods to extract
+    the response body in various formats.
+    """
+
+    def __init__(self, response: Any) -> None:
+        """
+        Initialize a Response wrapper.
+
+        Args:
+            response: The JavaScript Response object to wrap
+        """
+        ...
+
+    def __getattr__(self, attr: str) -> Any: ...
+    async def arrayBuffer(self) -> memoryview:
+        """
+        Read the response body as an ArrayBuffer.
+
+        Returns:
+            A memoryview of the response body bytes
+        """
+        ...
+
+    async def blob(self) -> Any:
+        """
+        Read the response body as a Blob.
+
+        Returns:
+            A JavaScript Blob object
+        """
+        ...
+
+    async def bytearray(self) -> bytearray:
+        """
+        Read the response body as a Python bytearray.
+
+        Returns:
+            The response body as a bytearray
+        """
+        ...
+
+    async def json(self) -> Any:
+        """
+        Parse the response body as JSON.
+
+        Returns:
+            The parsed JSON data (dict, list, or primitive types)
+        """
+        ...
+
+    async def text(self) -> str:
+        """
+        Read the response body as text.
+
+        Returns:
+            The response body as a string
+        """
+        ...
+
+class _DirectResponse:
+    """
+    Direct response wrapper for immediate fetch responses.
+
+    Provides direct access to response data without additional wrapping.
+    """
+
+    @staticmethod
+    def setup(promise: Any, response: Any) -> _Response:
+        """
+        Setup a response wrapper from a promise and response object.
+
+        Args:
+            promise: The JavaScript Promise object
+            response: The JavaScript Response object
+
+        Returns:
+            A _Response wrapper instance
+        """
+        ...
+
+    def __init__(self, promise: Any) -> None:
+        """
+        Initialize a DirectResponse wrapper.
+
+        Args:
+            promise: The JavaScript Promise to wrap
+        """
+        ...
+
+    async def arrayBuffer(self) -> memoryview:
+        """
+        Read the response body as an ArrayBuffer.
+
+        Returns:
+            A memoryview of the response body bytes
+        """
+        ...
+
+    async def blob(self) -> Any:
+        """
+        Read the response body as a Blob.
+
+        Returns:
+            A JavaScript Blob object
+        """
+        ...
+
+    async def bytearray(self) -> bytearray:
+        """
+        Read the response body as a Python bytearray.
+
+        Returns:
+            The response body as a bytearray
+        """
+        ...
+
+    async def json(self) -> Any:
+        """
+        Parse the response body as JSON.
+
+        Returns:
+            The parsed JSON data (dict, list, or primitive types)
+        """
+        ...
+
+    async def text(self) -> str:
+        """
+        Read the response body as text.
+
+        Returns:
+            The response body as a string
+        """
+        ...
+
+def fetch(url: str, **kw: Any) -> Awaitable[_Response]:
+    """
+    Fetch a resource from the network.
+
+    This is a Python wrapper around the JavaScript Fetch API, providing
+    an async interface for making HTTP requests.
+
+    Args:
+        url: The URL to fetch
+        **kw: Additional keyword arguments passed to the fetch request
+              (e.g., method, headers, body, mode, credentials, etc.)
+
+    Returns:
+        An awaitable that resolves to a _Response object
+
+    Example:
+        response = await fetch("https://api.example.com/data")
+        data = await response.json()
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/ffi.pyi b/src/pyscript-stubs/pyscript/ffi.pyi
new file mode 100644
index 0000000..c313a99
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/ffi.pyi
@@ -0,0 +1,91 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Callable, Iterable, Mapping
+
+def from_entries(iterable: Iterable[tuple[str, Any]]) -> Any:
+    """
+    Create a JavaScript object from an iterable of key-value pairs.
+
+    This function converts a Python iterable of (key, value) tuples into
+    a JavaScript object, similar to JavaScript's Object.fromEntries().
+
+    Args:
+        iterable: An iterable of (key, value) tuples where keys are strings
+
+    Returns:
+        A JavaScript object containing the key-value pairs
+
+    Example:
+        obj = from_entries([("name", "Alice"), ("age", 30)])
+        # Creates JS object: {name: "Alice", age: 30}
+    """
+    ...
+
+def create_proxy(obj: Any) -> Any:
+    """
+    Create a JavaScript proxy for a Python object.
+
+    This function wraps a Python object in a JavaScript Proxy, allowing
+    JavaScript code to interact with Python objects more naturally. This is
+    particularly useful for passing Python functions, objects, or collections
+    to JavaScript APIs.
+
+    Args:
+        obj: The Python object to wrap in a proxy
+
+    Returns:
+        A JavaScript Proxy that wraps the Python object
+
+    Example:
+        def my_callback(event):
+            print(f"Event: {event}")
+
+        js_callback = create_proxy(my_callback)
+        element.addEventListener("click", js_callback)
+    """
+    ...
+
+def to_js(
+    obj: Any,
+    *,
+    depth: int = -1,
+    default_converter: Callable[[Any], Any] | None = None,
+    dict_converter: Callable[[Mapping[str, Any]], Any] | None = None,
+    create_proxies: bool = True,
+) -> Any:
+    """
+    Convert a Python object to its JavaScript equivalent.
+
+    This function recursively converts Python objects to JavaScript objects,
+    handling common types like dict, list, tuple, etc. It provides fine-grained
+    control over the conversion process through various parameters.
+
+    Args:
+        obj: The Python object to convert
+        depth: Maximum recursion depth for conversion. -1 means unlimited.
+               Use 0 for shallow conversion, 1 for one level deep, etc.
+        default_converter: Optional custom converter function for types not
+                          handled by the default conversion logic
+        dict_converter: Optional custom converter specifically for dict objects.
+                       If not provided, dicts are converted to JS objects.
+        create_proxies: If True, creates proxies for unconvertible objects.
+                       If False, leaves them as Python objects.
+
+    Returns:
+        The JavaScript representation of the Python object
+
+    Example:
+        data = {"items": [1, 2, 3], "name": "test"}
+        js_data = to_js(data)
+        # Converts to JS: {items: [1, 2, 3], name: "test"}
+
+        # Shallow conversion
+        nested = {"outer": {"inner": "value"}}
+        js_shallow = to_js(nested, depth=1)
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/flatted.pyi b/src/pyscript-stubs/pyscript/flatted.pyi
new file mode 100644
index 0000000..4d7121f
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/flatted.pyi
@@ -0,0 +1,91 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Callable
+
+class _Known:
+    """
+    Internal class for tracking known objects during serialization.
+
+    Used by the flatted algorithm to detect and handle circular references.
+    """
+
+    def __init__(self) -> None:
+        """Initialize a _Known instance for tracking objects."""
+        ...
+
+class _String:
+    """
+    Internal wrapper class for string values during serialization.
+
+    Used by the flatted algorithm to distinguish between regular strings
+    and special marker strings.
+    """
+
+    def __init__(self, value: str) -> None:
+        """
+        Initialize a _String wrapper.
+
+        Args:
+            value: The string value to wrap
+        """
+        ...
+
+def parse(
+    value: str,
+    reviver: Callable[[str, Any], Any] | None = None,
+) -> Any:
+    """
+    Parse a flatted JSON string into a Python object.
+
+    Reconstructs objects from flatted JSON format, which can handle
+    circular references and repeated objects that standard JSON cannot.
+
+    Args:
+        value: The flatted JSON string to parse
+        reviver: Optional function to transform values during parsing.
+                Called for each key-value pair with (key, value) and
+                should return the transformed value.
+
+    Returns:
+        The reconstructed Python object
+
+    Example:
+        json_str = '["[Circular]","hello",{"ref":"0"}]'
+        obj = parse(json_str)
+    """
+    ...
+
+def stringify(
+    value: Any,
+    replacer: Callable[[str, Any], Any] | list[str] | None = None,
+    space: str | int = "",
+) -> str:
+    """
+    Convert a Python object to flatted JSON string.
+
+    Serializes objects to a JSON format that can handle circular references
+    and repeated objects, which standard JSON cannot handle.
+
+    Args:
+        value: The Python object to serialize
+        replacer: Optional function to transform values during serialization,
+                 called with (key, value) and should return the transformed
+                 value. Can also be a list of keys to include.
+        space: Indentation for pretty-printing. Can be a string (used as-is)
+              or an integer (number of spaces). Default is no indentation.
+
+    Returns:
+        A flatted JSON string representation of the object
+
+    Example:
+        obj = {"name": "Alice"}
+        obj["self"] = obj  # Circular reference
+        json_str = stringify(obj)  # Works with circular refs
+        json_str = stringify(obj, space=2)  # Pretty print
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/fs.pyi b/src/pyscript-stubs/pyscript/fs.pyi
new file mode 100644
index 0000000..886d5a4
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/fs.pyi
@@ -0,0 +1,61 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+
+This module provides filesystem operations for PyScript applications,
+allowing mounting, syncing, and unmounting of virtual filesystems.
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Dict, Literal
+
+mounted: Dict[str, Dict[str, Any]]
+"""Dictionary mapping mount points to filesystem information"""
+
+async def mount(
+    path: str,
+    mode: Literal["readwrite", "read"] = "readwrite",
+    root: Literal["desktop", "documents", "downloads", "music", "pictures", "videos", ""] = "",
+    id: str = "pyscript",
+) -> None:
+    """
+    Mount a filesystem at the specified path.
+
+    Args:
+        path: The path where the filesystem should be mounted
+        mode: Access mode, either "r" (read-only) or "rw" (read-write)
+        root: The root directory to mount (local path or URL)
+        id: Optional identifier for the mounted filesystem
+
+    Raises:
+        ValueError: If the path is already mounted or parameters are invalid
+        PermissionError: If the browser denies filesystem access
+    """
+    ...
+
+async def sync(path: str) -> None:
+    """
+    Synchronize changes to the filesystem mounted at the given path.
+
+    This ensures any pending changes are written to the underlying storage.
+
+    Args:
+        path: The path to the mounted filesystem to synchronize
+
+    Raises:
+        ValueError: If no filesystem is mounted at the specified path
+    """
+    ...
+
+async def unmount(path: str) -> None:
+    """
+    Unmount the filesystem at the specified path.
+
+    Args:
+        path: The path of the mounted filesystem to unmount
+
+    Raises:
+        ValueError: If no filesystem is mounted at the specified path
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/magic_js.pyi b/src/pyscript-stubs/pyscript/magic_js.pyi
new file mode 100644
index 0000000..9dadf63
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/magic_js.pyi
@@ -0,0 +1,88 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from __future__ import annotations
+
+import sys
+from typing import Any, Callable
+
+from _pyscript import PyWorker as PyWorker
+from _pyscript import js_import as js_import
+from libcst import Not
+from typing_extensions import Incomplete
+
+RUNNING_IN_WORKER: bool
+"""True if code is running in a web worker, False if in main thread."""
+
+config: dict[str, Any]
+"""PyScript configuration object containing runtime settings."""
+
+# generate N modules in the system that will proxy the real value
+# for name in globalThis.Reflect.ownKeys(js_modules):
+#     sys.modules[f"pyscript.js_modules.{name}"] = JSModule(name)
+# sys.modules["pyscript.js_modules"] = js_modules
+
+class JSModule:
+    """
+    Lazy loader for JavaScript modules.
+
+    Provides a Python interface to dynamically import and access
+    JavaScript modules and their exports.
+    """
+
+    def __init__(self, name: str) -> None:
+        """
+        Initialize a JSModule loader.
+
+        Args:
+            name: The name or path of the JavaScript module to load
+        """
+        ...
+
+    def __getattr__(self, field: str) -> Any | None: ...
+
+PyWorker: None
+"""Not available in worker context (None)."""
+
+window: Incomplete | None
+"""
+The browser's window object.
+
+Provides access to the global window object and all its properties
+and methods when running in the main thread.
+
+Not available in worker context (None).
+"""
+
+document: Incomplete | None
+"""
+The browser's document object.
+
+Provides access to the DOM (Document Object Model) for manipulating
+HTML elements when running in the main thread.
+
+Not available in worker context (None)."""
+
+sync: Callable[[Any], Any]
+"""
+A function used to pass serializable data from workers to the main thread.
+
+Convert async operations to synchronous calls when running in a worker.
+
+ref: https://docs.pyscript.net/latest/api/#pyscriptsync
+"""
+
+def current_target() -> Any:
+    """
+    Get the current execution target in worker context.
+
+    Returns:
+        The worker's global scope object
+
+    rRef: https://docs.pyscript.net/2025.8.1/api/#pyscriptcurrent_target
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/media.pyi b/src/pyscript-stubs/pyscript/media.pyi
new file mode 100644
index 0000000..fbdfa7e
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/media.pyi
@@ -0,0 +1,149 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Literal
+
+class Device:
+    """
+    Device represents a media input or output device.
+
+    Represents devices such as a microphone, camera, or headset.
+    Provides access to device properties and streams.
+    """
+
+    def __init__(self, device: Any) -> None:
+        """
+        Initialize a Device wrapper.
+
+        Args:
+            device: The JavaScript MediaDeviceInfo object to wrap
+        """
+        ...
+
+    @property
+    def id(self) -> str:
+        """
+        Get the device identifier.
+
+        Returns:
+            A unique identifier for the device that persists across sessions
+        """
+        ...
+
+    @property
+    def group(self) -> str:
+        """
+        Get the device group identifier.
+
+        Returns:
+            A group identifier shared by devices that belong to the same
+            physical device (e.g., a monitor with both camera and microphone)
+        """
+        ...
+
+    @property
+    def kind(self) -> Literal["videoinput", "audioinput", "audiooutput"]:
+        """
+        Get the device kind.
+
+        Returns:
+            The type of device: "videoinput", "audioinput", or "audiooutput"
+        """
+        ...
+
+    @property
+    def label(self) -> str:
+        """
+        Get the device label.
+
+        Returns:
+            A human-readable description of the device
+            (e.g., "External USB Webcam")
+        """
+        ...
+
+    def __getitem__(self, key: str) -> Any: ...
+    @classmethod
+    async def load(
+        cls,
+        audio: bool | dict[str, Any] = False,
+        video: bool | dict[str, Any] = False,
+    ) -> "Device":
+        """
+        Load a device and request access to its stream.
+
+        Requests user permission to access the specified media devices
+        and returns a Device instance with an active stream.
+
+        Args:
+            audio: True to request audio, False to skip, or a dict with
+                   constraints (e.g., {"echoCancellation": True})
+            video: True to request video, False to skip, or a dict with
+                   constraints (e.g., {"width": 1280, "height": 720})
+
+        Returns:
+            A Device instance with an active media stream
+
+        Example:
+            # Request audio and video
+            device = await Device.load(audio=True, video=True)
+
+            # Request video with constraints
+            device = await Device.load(
+                video={"width": 1920, "height": 1080}
+            )
+        """
+        ...
+
+    async def get_stream(self) -> Any:
+        """
+        Get the media stream from this device.
+
+        Returns:
+            A JavaScript MediaStream object for this device
+
+        Example:
+            device = await Device.load(video=True)
+            stream = await device.get_stream()
+            # Use stream with video element
+        """
+        ...
+
+async def list_devices() -> list[dict[str, str]]:
+    """
+    List all available media input and output devices.
+
+    Return the list of the currently available media input and output devices,
+    such as microphones, cameras, headsets, and so forth.
+
+    Returns:
+        A list of dictionaries representing the available media devices.
+        Each dictionary has the following keys:
+        * deviceId: A string identifier for the device that persists across
+          sessions. It is un-guessable by other applications and unique to
+          the origin of the calling application. Reset when user clears cookies.
+        * groupId: A string group identifier. Two devices have the same group
+          identifier if they belong to the same physical device (e.g., a
+          monitor with both a built-in camera and microphone).
+        * kind: An enumerated value that is either "videoinput", "audioinput",
+          or "audiooutput".
+        * label: A string describing this device (e.g., "External USB Webcam").
+
+    Note:
+        The returned list will omit any devices that are blocked by the document
+        Permission Policy: microphone, camera, speaker-selection (for output
+        devices), and so on. Access to particular non-default devices is also
+        gated by the Permissions API, and the list will omit devices for which
+        the user has not granted explicit permission.
+
+    Example:
+        devices = await list_devices()
+        for device in devices:
+            print(f"{device['kind']}: {device['label']}")
+
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/polyscript.pyi b/src/pyscript-stubs/pyscript/polyscript.pyi
new file mode 100644
index 0000000..3359b2a
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/polyscript.pyi
@@ -0,0 +1,37 @@
+"""
+Basic typing for polyscript
+
+https://pyscript.github.io/polyscript/#the-polyscript-module
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+# https://github.com/pyscript/polyscript
+
+# XWorker	from polyscript import XWorker	described in the XWorker part.
+# config	from polyscript import config	custom only: the used config as object literal
+# currentScript	from polyscript import currentScript	it’s an explicit, always correct, reference to the current node running the generic script code.
+# js_modules	from polyscript import js_modules	described in the Extra config Features part.
+# lazy_py_modules	from polyscript import lazy_py_modules	allows, only in Python related interpreters, and without needing static config entries, to import lazily any available module.
+# storage	from polyscript import storage	a utility to instantiate a named idb-map that can be consumed synchronously.
+# JSON	from polyscript import JSON	a utility to stringify/parse more complex or recursive data via
+
+from typing import Tuple
+
+# avoid name collisions
+import storage as _storage
+
+storage = _storage.storage
+
+async def lazy_py_modules(*args: str) -> Tuple:
+    """
+    allows, only in Python related interpreters, and without needing static config entries, to import lazily any available module.
+
+    Example:
+        from polyscript import lazy_py_modules
+        matplotlib, regex, = await lazy_py_modules("matplotlib", "regex")
+        print(matplotlib, regex)
+
+    """
+
+    ...
diff --git a/src/pyscript-stubs/pyscript/storage.pyi b/src/pyscript-stubs/pyscript/storage.pyi
new file mode 100644
index 0000000..20c4f12
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/storage.pyi
@@ -0,0 +1,87 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Type
+
+class Storage(dict[str, Any]):
+    """
+    Persistent storage interface backed by IndexedDB.
+
+    Extends dict to provide a dictionary-like interface for storing
+    and retrieving data that persists across browser sessions.
+    Data is stored in the browser's IndexedDB.
+    """
+
+    def __init__(self, store: Any) -> None:
+        """
+        Initialize a Storage instance.
+
+        Args:
+            store: The underlying IndexedDB store object
+        """
+        ...
+
+    def __delitem__(self, attr: str) -> None: ...
+    def __setitem__(self, attr: str, value: Any) -> None: ...
+    def clear(self) -> None:
+        """
+        Remove all items from storage.
+
+        Clears all key-value pairs from the storage instance.
+        """
+        ...
+
+    async def sync(self) -> None:
+        """
+        Synchronize storage with IndexedDB.
+
+        Ensures all pending writes are committed to the underlying
+        IndexedDB store. Call this after making changes to persist them.
+
+        Example:
+            store = await storage("my_data")
+            store["key"] = "value"
+            await store.sync()  # Persist changes
+        """
+        ...
+
+async def storage(
+    name: str = "pyscript",
+    storage_class: Type[Storage] = Storage,
+) -> Storage:
+    """
+    Create or access a named storage instance.
+
+    A utility to instantiate a named idb-map (IndexedDB-backed storage)
+    that can be consumed synchronously after initial async setup.
+
+    Args:
+        name: The name of the storage instance. Different names create
+              separate storage namespaces. Default is "pyscript".
+        storage_class: The Storage class to instantiate. Default is Storage.
+                      Can be a custom subclass for specialized behavior.
+
+    Returns:
+        A Storage instance that acts like a dict but persists data
+        to IndexedDB
+
+    Example:
+        # Create/access storage
+        store = await storage("my_app_data")
+
+        # Use like a dict
+        store["username"] = "alice"
+        store["settings"] = {"theme": "dark"}
+
+        # Persist changes
+        await store.sync()
+
+        # Later, access the same data
+        store = await storage("my_app_data")
+        print(store["username"])  # "alice"
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/util.pyi b/src/pyscript-stubs/pyscript/util.pyi
new file mode 100644
index 0000000..7219d29
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/util.pyi
@@ -0,0 +1,34 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+def as_bytearray(buffer) -> bytearray:
+    """
+    Given a JavaScript ArrayBuffer, convert it to a Python bytearray in a
+    MicroPython friendly manner.
+    """
+    ...
+
+class NotSupported:
+    """
+    Small helper that raises exceptions if you try to get/set any attribute on
+    it.
+    """
+
+    def __init__(self, name, error) -> None: ...
+    def __repr__(self) -> str: ...
+    def __getattr__(self, attr): ...
+    def __setattr__(self, attr, value): ...
+    def __call__(self, *args): ...
+
+def is_awaitable(obj) -> bool:
+    """
+    Returns a boolean indication if the passed in obj is an awaitable
+    function. (MicroPython treats awaitables as generator functions, and if
+    the object is a closure containing an async function we need to work
+    carefully.)
+    """
+    ...
diff --git a/src/pyscript-stubs/pyscript/web.pyi b/src/pyscript-stubs/pyscript/web.pyi
new file mode 100644
index 0000000..7917c65
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/web.pyi
@@ -0,0 +1,921 @@
+"""
+Lightweight interface to the DOM and HTML elements.
+
+As a convenience, and to ensure backwards compatibility, PyScript allows the use of inline event handlers via custom HTML attributes.
+
+Warning:
+    This classic pattern of coding (inline event handlers) is no longer considered good practice in web development circles.
+
+We include this behaviour for historic reasons, but the folks at Mozilla have a good explanation of why this is currently considered bad practice.
+
+These attributes, expressed as py-* or mpy-* attributes of an HTML element, reference the name of a Python function to run when the event is fired.
+You should replace the * with the actual name of an event (e.g. py-click or mpy-click). This is similar to how all event handlers on elements start
+with on in standard HTML (e.g. onclick). The rule of thumb is to simply replace on with py- or mpy- and then reference the name of a Python function.
+"""
+
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from __future__ import annotations
+
+from typing import Any, Generator, List
+
+from _typeshed import Incomplete
+from pyscript import Event, document
+from pyscript import when as when
+from pyscript.ffi import create_proxy
+from typing_extensions import Self
+
+ELEMENT_CLASSES: ElementCollection = ...
+page: Page = ...
+
+def wrap_dom_element(dom_element):
+    """Wrap an existing DOM element in an instance of a subclass of `Element`.
+
+    This is just a convenience function to avoid having to import the `Element` class
+    and use its class method.
+    """
+    ...
+
+class Element:
+    element_classes_by_tag_name = ...
+    @classmethod
+    def get_tag_name(cls) -> str:
+        """Return the HTML tag name for the class.
+
+        For classes that have a trailing underscore (because they clash with a Python
+        keyword or built-in), we remove it to get the tag name. e.g. for the `input_`
+        class, the tag name is `input`.
+
+        """
+        ...
+
+    @classmethod
+    def register_element_classes(cls, element_classes) -> None:
+        """Register an iterable of element classes."""
+        ...
+
+    @classmethod
+    def unregister_element_classes(cls, element_classes) -> None:
+        """Unregister an iterable of element classes."""
+        ...
+
+    @classmethod
+    def wrap_dom_element(cls, dom_element):
+        """Wrap an existing DOM element in an instance of a subclass of `Element`.
+
+        We look up the `Element` subclass by the DOM element's tag name. For any unknown
+        elements (custom tags etc.) use *this* class (`Element`).
+        """
+        ...
+
+    def __init__(self, dom_element=..., classes=..., style=..., **kwargs) -> None:
+        """Create a new, or wrap an existing DOM element.
+
+        If `dom_element` is None we are being called to *create* a new element.
+        Otherwise, we are being called to *wrap* an existing DOM element.
+        """
+        ...
+
+    def __eq__(self, obj) -> bool:
+        """Check for equality by comparing the underlying DOM element."""
+        ...
+
+    def __getitem__(self, key) -> ElementCollection:
+        """Get an item within the element's children.
+
+        If `key` is an integer or a slice we use it to index/slice the element's
+        children. Otherwise, we use `key` as a query selector.
+        """
+        ...
+
+    def __getattr__(self, name) -> Event | Any:
+        """
+        Get an attribute from the element.
+
+        If the attribute is an event (e.g. "on_click"), we wrap it in an `Event`
+        instance and return that. Otherwise, we return the attribute from the
+        underlying DOM element.
+        """
+        ...
+
+    def __setattr__(self, name, value) -> None: ...
+    def get_event(self, name) -> Event:
+        """
+        Get an `Event` instance for the specified event name.
+        """
+        ...
+
+    @property
+    def children(self) -> ElementCollection:
+        """Return the element's children as an `ElementCollection`."""
+        ...
+
+    @property
+    def classes(self) -> Classes:
+        """Return the element's `classList` as a `Classes` instance."""
+        ...
+
+    @property
+    def parent(self) -> None:
+        """Return the element's `parent `Element`."""
+        ...
+
+    @property
+    def style(self) -> Style:
+        """Return the element's `style` attribute as a `Style` instance."""
+        ...
+
+    def append(self, *items) -> None:
+        """Append the specified items to the element."""
+        ...
+
+    def clone(self, clone_id=...):
+        """Make a clone of the element (clones the underlying DOM object too)."""
+        ...
+
+    def find(self, selector) -> ElementCollection:
+        """Find all elements that match the specified selector.
+
+        Return the results as a (possibly empty) `ElementCollection`.
+        """
+        ...
+
+    def show_me(self) -> None:
+        """Convenience method for 'element.scrollIntoView()'."""
+        ...
+
+    def update(self, classes=..., style=..., **kwargs) -> None:
+        """Update the element with the specified classes, styles, and DOM properties."""
+        ...
+
+class Classes:
+    """A set-like interface to an element's `classList`."""
+
+    def __init__(self, element: Element) -> None: ...
+    def __contains__(self, item) -> bool: ...
+    def __eq__(self, other) -> bool: ...
+    def __iter__(self): ...
+    def __len__(self) -> int: ...
+    def __repr__(self) -> str: ...
+    def __str__(self) -> str: ...
+    def add(self, *class_names) -> None:
+        """Add one or more classes to the element."""
+        ...
+
+    def contains(self, class_name) -> bool:
+        """Check if the element has the specified class."""
+        ...
+
+    def remove(self, *class_names) -> None:
+        """Remove one or more classes from the element."""
+        ...
+
+    def replace(self, old_class, new_class) -> None:
+        """Replace one of the element's classes with another."""
+        ...
+
+    def toggle(self, *class_names) -> None:
+        """Toggle one or more of the element's classes."""
+        ...
+
+class HasOptions:
+    """Mix-in for elements that have an options attribute.
+
+    The elements that support options are: <datalist>, <optgroup>, and <select>.
+    """
+
+    @property
+    def options(self) -> Options:
+        """Return the element's options as an `Options"""
+        ...
+
+class Options:
+    """This class represents the <option>s of a <datalist>, <optgroup> or <select>.
+
+    It allows access to add and remove <option>s by using the `add`, `remove` and
+    `clear` methods.
+    """
+
+    def __init__(self, element) -> None: ...
+    def __getitem__(self, key): ...
+    def __iter__(self) -> Generator[Any, Any, None]: ...
+    def __len__(self) -> int: ...
+    def __repr__(self) -> str: ...
+    @property
+    def options(self) -> list[Any]:
+        """Return the list of options."""
+        ...
+
+    @property
+    def selected(self):
+        """Return the selected option."""
+        ...
+
+    def add(self, value=..., html=..., text=..., before=..., **kwargs) -> None:
+        """Add a new option to the element"""
+        ...
+
+    def clear(self) -> None:
+        """Remove all options."""
+        ...
+
+    def remove(self, index) -> None:
+        """Remove the option at the specified index."""
+        ...
+
+class Style:
+    """A dict-like interface to an element's `style` attribute."""
+
+    def __init__(self, element: Element) -> None: ...
+    def __getitem__(self, key) -> Element: ...
+    def __setitem__(self, key, value) -> None: ...
+    def remove(self, key) -> None:
+        """Remove a CSS property from the element."""
+        ...
+
+    def set(self, **kwargs) -> None:
+        """Set one or more CSS properties on the element."""
+        ...
+
+    @property
+    def visible(self) -> Incomplete: ...
+    @visible.setter
+    def visible(self, value) -> None: ...
+
+class ContainerElement(Element):
+    """Base class for elements that can contain other elements."""
+
+    def __init__(self, *args, children=..., dom_element=..., style=..., classes=..., **kwargs) -> None: ...
+    def __iter__(self) -> Generator[Any, Any, None]: ...
+
+class ClassesCollection:
+    """A set-like interface to the classes of the elements in a collection."""
+
+    def __init__(self, collection) -> None: ...
+    def __contains__(self, class_name) -> bool: ...
+    def __eq__(self, other) -> bool: ...
+    def __iter__(self) -> Generator[Any, Any, None]: ...
+    def __len__(self) -> int: ...
+    def __repr__(self) -> str: ...
+    def __str__(self) -> str: ...
+    def add(self, *class_names) -> None:
+        """Add one or more classes to the elements in the collection."""
+        ...
+
+    def contains(self, class_name) -> bool:
+        """Check if any element in the collection has the specified class."""
+        ...
+
+    def remove(self, *class_names) -> None:
+        """Remove one or more classes from the elements in the collection."""
+        ...
+
+    def replace(self, old_class, new_class) -> None:
+        """Replace one of the classes in the elements in the collection with another."""
+        ...
+
+    def toggle(self, *class_names) -> None:
+        """Toggle one or more classes on the elements in the collection."""
+        ...
+
+class StyleCollection:
+    """A dict-like interface to the styles of the elements in a collection."""
+
+    def __init__(self, collection) -> None: ...
+    def __getitem__(self, key) -> list[Any]: ...
+    def __setitem__(self, key, value) -> None: ...
+    def __repr__(self) -> str: ...
+    def remove(self, key) -> None:
+        """Remove a CSS property from the elements in the collection."""
+        ...
+
+class ElementCollection:
+    @classmethod
+    def wrap_dom_elements(cls, dom_elements) -> Self:
+        """Wrap an iterable of dom_elements in an `ElementCollection`."""
+        ...
+
+    def __init__(self, elements: List[Element]) -> None: ...
+    def __eq__(self, obj) -> bool:
+        """Check for equality by comparing the underlying DOM elements."""
+        ...
+
+    def __getitem__(self, key) -> ElementCollection:
+        """Get an item in the collection.
+
+        If `key` is an integer or a slice we use it to index/slice the collection.
+        Otherwise, we use `key` as a query selector.
+        """
+        ...
+
+    def __iter__(self) -> Generator[Any, Any, None]: ...
+    def __len__(self) -> int: ...
+    def __repr__(self) -> str: ...
+    def __getattr__(self, name) -> list[Any]: ...
+    def __setattr__(self, name, value) -> None: ...
+    @property
+    def classes(self) -> ClassesCollection:
+        """Return the classes of the elements in the collection as a `ClassesCollection`."""
+        ...
+
+    @property
+    def elements(self):
+        """Return the elements in the collection as a list."""
+        ...
+
+    @property
+    def style(self) -> StyleCollection:
+        """"""
+        ...
+
+    def find(self, selector) -> ElementCollection:
+        """Find all elements that match the specified selector.
+
+        Return the results as a (possibly empty) `ElementCollection`.
+        """
+        ...
+
+class a(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a"""
+
+    ...
+
+class abbr(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/abbr"""
+
+    ...
+
+class address(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/address"""
+
+    ...
+
+class area(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/area"""
+
+    ...
+
+class article(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/article"""
+
+    ...
+
+class aside(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/aside"""
+
+    ...
+
+class audio(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/audio"""
+
+    ...
+
+class b(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/b"""
+
+    ...
+
+class base(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base"""
+
+    ...
+
+class blockquote(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/blockquote"""
+
+    ...
+
+class body(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/body"""
+
+    ...
+
+class br(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/br"""
+
+    ...
+
+class button(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button"""
+
+    ...
+
+class canvas(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/canvas"""
+
+    def download(self, filename: str = ...) -> None:
+        """Download the current element with the filename provided in input.
+
+        Inputs:
+            * filename (str): name of the file being downloaded
+
+        Output:
+            None
+        """
+        ...
+
+    def draw(self, what, width=..., height=...) -> None:
+        """Draw `what` on the current element
+
+        Inputs:
+
+            * what (canvas image source): An element to draw into the context. The
+                specification permits any canvas image source, specifically, an
+                HTMLImageElement, an SVGImageElement, an HTMLVideoElement,
+                an HTMLCanvasElement, an ImageBitmap, an OffscreenCanvas, or a
+                VideoFrame.
+        """
+        ...
+
+class caption(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/caption"""
+
+    ...
+
+class cite(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/cite"""
+
+    ...
+
+class code(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/code"""
+
+    ...
+
+class col(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/col"""
+
+    ...
+
+class colgroup(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/colgroup"""
+
+    ...
+
+class data(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/data"""
+
+    ...
+
+class datalist(ContainerElement, HasOptions):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/datalist"""
+
+    ...
+
+class dd(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dd"""
+
+    ...
+
+class del_(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/del"""
+
+    ...
+
+class details(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details"""
+
+    ...
+
+class dialog(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dialog"""
+
+    ...
+
+class div(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/div"""
+
+    ...
+
+class dl(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dl"""
+
+    ...
+
+class dt(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dt"""
+
+    ...
+
+class em(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/em"""
+
+    ...
+
+class embed(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/embed"""
+
+    ...
+
+class fieldset(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/fieldset"""
+
+    ...
+
+class figcaption(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/figcaption"""
+
+    ...
+
+class figure(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/figure"""
+
+    ...
+
+class footer(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/footer"""
+
+    ...
+
+class form(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form"""
+
+    ...
+
+class h1(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h1"""
+
+    ...
+
+class h2(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h2"""
+
+    ...
+
+class h3(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h3"""
+
+    ...
+
+class h4(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h4"""
+
+    ...
+
+class h5(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h5"""
+
+    ...
+
+class h6(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/h6"""
+
+    ...
+
+class head(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/head"""
+
+    ...
+
+class header(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/header"""
+
+    ...
+
+class hgroup(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/hgroup"""
+
+    ...
+
+class hr(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/hr"""
+
+    ...
+
+class html(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/html"""
+
+    ...
+
+class i(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/i"""
+
+    ...
+
+class iframe(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe"""
+
+    ...
+
+class img(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img"""
+
+    ...
+
+class input_(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input"""
+
+    ...
+
+class ins(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ins"""
+
+    ...
+
+class kbd(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/kbd"""
+
+    ...
+
+class label(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label"""
+
+    ...
+
+class legend(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/legend"""
+
+    ...
+
+class li(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/li"""
+
+    ...
+
+class link(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link"""
+
+    ...
+
+class main(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/main"""
+
+    ...
+
+class map_(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/map"""
+
+    ...
+
+class mark(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/mark"""
+
+    ...
+
+class menu(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/menu"""
+
+    ...
+
+class meta(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meta"""
+
+    ...
+
+class meter(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/meter"""
+
+    ...
+
+class nav(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/nav"""
+
+    ...
+
+class object_(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/object"""
+
+    ...
+
+class ol(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol"""
+
+    ...
+
+class optgroup(ContainerElement, HasOptions):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/optgroup"""
+
+    ...
+
+class option(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/option"""
+
+    ...
+
+class output(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/output"""
+
+    ...
+
+class p(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/p"""
+
+    ...
+
+class param(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/param"""
+
+    ...
+
+class picture(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/picture"""
+
+    ...
+
+class pre(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/pre"""
+
+    ...
+
+class progress(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress"""
+
+    ...
+
+class q(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/q"""
+
+    ...
+
+class s(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/s"""
+
+    ...
+
+class script(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script"""
+
+    ...
+
+class section(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/section"""
+
+    ...
+
+class select(ContainerElement, HasOptions):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select"""
+
+    ...
+
+class small(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/small"""
+
+    ...
+
+class source(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/source"""
+
+    ...
+
+class span(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/span"""
+
+    ...
+
+class strong(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/strong"""
+
+    ...
+
+class style(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/style"""
+
+    ...
+
+class sub(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/sub"""
+
+    ...
+
+class summary(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/summary"""
+
+    ...
+
+class sup(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/sup"""
+
+    ...
+
+class table(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/table"""
+
+    ...
+
+class tbody(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tbody"""
+
+    ...
+
+class td(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/td"""
+
+    ...
+
+class template(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/template"""
+
+    ...
+
+class textarea(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea"""
+
+    ...
+
+class tfoot(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tfoot"""
+
+    ...
+
+class th(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/th"""
+
+    ...
+
+class thead(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/thead"""
+
+    ...
+
+class time(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time"""
+
+    ...
+
+class title(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title"""
+
+    ...
+
+class tr(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tr"""
+
+    ...
+
+class track(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/track"""
+
+    ...
+
+class u(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/u"""
+
+    ...
+
+class ul(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ul"""
+
+    ...
+
+class var(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/var"""
+
+    ...
+
+class video(ContainerElement):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video"""
+
+    def snap(self, to: Element | str = ..., width: int | None = ..., height: int | None = ...) -> canvas | Element:
+        """
+        Capture a snapshot (i.e. a single frame) of a video to a canvas.
+
+        Inputs:
+
+            * to: the canvas to save the video frame to (if None, one is created).
+            * width: width of the snapshot (defaults to the video width).
+            * height: height of the snapshot (defaults to the video height).
+
+        Output:
+            (Element) canvas element where the video frame snapshot was drawn into
+        """
+        ...
+
+class wbr(Element):
+    """Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/wbr"""
+
+    ...
+
+class Page:
+    """Represents the whole page."""
+
+    def __init__(self) -> None: ...
+    def __getitem__(self, selector) -> ElementCollection:
+        """Get an item on the page.
+
+        We don't index/slice the page like we do with `Element` and `ElementCollection`
+        as it is a bit muddier what the ideal behavior should be. Instead, we simply
+        use this as a convenience method to `find` elements on the page.
+        """
+        ...
+
+    @property
+    def title(self) -> str:
+        """Return the page title."""
+        ...
+
+    @title.setter
+    def title(self, value) -> None:
+        """Set the page title."""
+        ...
+
+    def append(self, *items) -> None:
+        """Shortcut for `page.body.append`."""
+        ...
+
+    def find(self, selector) -> ElementCollection:
+        """Find all elements that match the specified selector.
+
+        Return the results as a (possibly empty) `ElementCollection`.
+        """
+        ...
diff --git a/src/pyscript-stubs/pyscript/websocket.pyi b/src/pyscript-stubs/pyscript/websocket.pyi
new file mode 100644
index 0000000..d7f6b5a
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/websocket.pyi
@@ -0,0 +1,122 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any, Literal
+
+code: dict[str, int]
+"""Dictionary of WebSocket close codes (e.g., NORMAL_CLOSURE, GOING_AWAY)."""
+
+protocols: list[str]
+"""List of supported WebSocket sub-protocols."""
+
+reason: dict[str, str]
+"""Dictionary mapping close codes to reason strings."""
+
+methods: dict[str, str]
+"""Dictionary of WebSocket method names."""
+
+class EventMessage:
+    """
+    Wrapper for WebSocket event messages.
+
+    Provides access to WebSocket event properties such as data,
+    origin, and other event-specific attributes.
+    """
+
+    def __init__(self, event: Any) -> None:
+        """
+        Initialize an EventMessage wrapper.
+
+        Args:
+            event: The JavaScript WebSocket event object to wrap
+        """
+        ...
+
+    def __getattr__(self, attr: str) -> Any | memoryview | str:
+        """
+        Access event attributes.
+
+        Args:
+            attr: The attribute name (e.g., 'data', 'origin', 'type')
+
+        Returns:
+            The attribute value, which may be a memoryview for binary data,
+            a string for text data, or other types depending on the attribute
+        """
+        ...
+
+class WebSocket:
+    """
+    PyScript WebSocket client for bidirectional communication.
+
+    Provides a Python interface to the browser's WebSocket API for
+    establishing persistent connections to WebSocket servers.
+    """
+
+    CONNECTING: Literal[0]
+    """WebSocket is connecting (readyState = 0)."""
+
+    OPEN: Literal[1]
+    """WebSocket connection is open (readyState = 1)."""
+
+    CLOSING: Literal[2]
+    """WebSocket is closing (readyState = 2)."""
+
+    CLOSED: Literal[3]
+    """WebSocket is closed (readyState = 3)."""
+
+    def __init__(
+        self,
+        url: str | None = None,
+        protocols: str | list[str] | None = None,
+        **kw: Any,
+    ) -> None:
+        """
+        Create a new WebSocket connection.
+
+        Args:
+            url: The WebSocket URL to connect to (ws:// or wss://)
+            protocols: Optional sub-protocol(s) to use
+            **kw: Additional keyword arguments for event handlers
+                  (e.g., onopen, onmessage, onerror, onclose)
+
+        Example:
+            ws = WebSocket(
+                url="wss://example.com/socket",
+                onmessage=lambda msg: print(msg.data)
+            )
+        """
+        ...
+
+    def __getattr__(self, attr: str) -> Any: ...
+    def __setattr__(self, attr: str, value: Any) -> None: ...
+    def close(self, code: int = 1000, reason: str = "") -> None:
+        """
+        Close the WebSocket connection.
+
+        Args:
+            code: The close status code (default: 1000 for normal closure)
+            reason: Optional human-readable reason string
+
+        Example:
+            ws.close(1000, "Client closing connection")
+        """
+        ...
+
+    def send(self, data: str | bytes | bytearray | memoryview) -> None:
+        """
+        Send data through the WebSocket connection.
+
+        Args:
+            data: The data to send. Can be text (str) or binary data
+                  (bytes, bytearray, memoryview)
+
+        Example:
+            ws.send("Hello, server!")
+            ws.send(b"Binary data")
+        """
+        ...
diff --git a/src/pyscript-stubs/pyscript/workers.pyi b/src/pyscript-stubs/pyscript/workers.pyi
new file mode 100644
index 0000000..de7bb2d
--- /dev/null
+++ b/src/pyscript-stubs/pyscript/workers.pyi
@@ -0,0 +1,74 @@
+"""
+Pyscript 2025.2.3 type-stub.
+see: https://docs.pyscript.net/2025.2.3/api/
+"""
+# Copyright (c) 2020-2025 Jos Verlinde
+# MIT Licensed
+
+from typing import Any
+
+def _get(name: str) -> Any:
+    """
+    Internal function to get a worker by name.
+
+    Args:
+        name: The name of the worker to retrieve
+
+    Returns:
+        The worker object
+    """
+    ...
+
+class _ReadOnlyProxy:
+    """
+    Read-only proxy wrapper for worker objects.
+
+    Provides read-only access to worker properties through item
+    and attribute access.
+    """
+
+    def __getitem__(self, name: str) -> Any: ...
+    def __getattr__(self, name: str) -> Any: ...
+
+workers: _ReadOnlyProxy
+"""
+Read-only proxy to access named workers.
+
+Provides access to workers created with create_named_worker() by their names.
+"""
+
+async def create_named_worker(
+    src: str = "",
+    name: str = "",
+    config: dict[str, Any] | None = None,
+    type: str = "micropython",
+) -> Any:
+    """
+    Create a named web worker for parallel execution.
+
+    Creates a PyScript worker that runs in a separate thread, allowing
+    for parallel execution of Python code. Workers can be accessed later
+    via the workers proxy.
+
+    Args:
+        src: The Python source code or URL to run in the worker.
+             If empty, creates a worker with no initial code.
+        name: The name to assign to the worker. Used to access it via
+              the workers proxy.
+        config: Optional configuration dictionary for the worker.
+                Can include interpreter settings and other options.
+        type: The worker type/interpreter. Default is "micropython".
+              Other options include "pyodide" or "python".
+
+    Returns:
+        A worker object that can be used to communicate with the worker
+
+    Example:
+        worker = await create_named_worker(
+            src="print('Hello from worker')",
+            name="my_worker",
+            type="micropython"
+        )
+        # Access later via: workers.my_worker
+    """
+    ...