diff --git a/website/src/components/container.rs b/website/src/components/container.rs
index e793e61597..686c5ebe26 100644
--- a/website/src/components/container.rs
+++ b/website/src/components/container.rs
@@ -9,7 +9,7 @@ pub struct ContainerProps<'a, G: Html> {
     pub footer: bool,
 }
 
-#[component(Container<G>)]
+#[component]
 pub fn Container<'a, G: Html>(cx: Scope<'a>, props: ContainerProps<'a, G>) -> View<G> {
     let children = props.children.call(cx);
 
diff --git a/website/src/templates/comparisons.rs b/website/src/templates/comparisons.rs
index e4516f6894..96e83672b9 100644
--- a/website/src/templates/comparisons.rs
+++ b/website/src/templates/comparisons.rs
@@ -20,7 +20,7 @@ struct ComparisonRowProps<'a> {
     comparison_val: &'a ReadSignal<String>,
     name: String,
 }
-#[component(ComparisonRow<G>)]
+#[component]
 fn ComparisonRow<'a, G: Html>(cx: Scope<'a>, props: ComparisonRowProps<'a>) -> View<G> {
     let show_details = create_signal(cx, false);
     let name = create_ref(cx, props.name);
@@ -67,7 +67,7 @@ struct ComparisonTableProps<'a> {
     comparison: &'a ReadSignal<Comparison>,
     perseus_comparison: Comparison,
 }
-#[component(ComparisonTable<G>)]
+#[component]
 fn ComparisonTable<'a, G: Html>(cx: Scope<'a>, props: ComparisonTableProps<'a>) -> View<G> {
     let comparison = props.comparison;
     let Comparison {
@@ -279,7 +279,7 @@ pub struct ComparisonsPageProps {
 }
 
 #[perseus::template(ComparisonsPage)]
-#[component(ComparisonsPage<G>)]
+#[component]
 pub fn comparisons_page<G: Html>(cx: Scope, props: ComparisonsPageProps) -> View<G> {
     let comparisons = props.comparisons.clone();
     let perseus_comparison = props.perseus_comparison;
diff --git a/website/src/templates/docs/container.rs b/website/src/templates/docs/container.rs
index 0e79a6595d..e31e38ddaa 100644
--- a/website/src/templates/docs/container.rs
+++ b/website/src/templates/docs/container.rs
@@ -15,7 +15,7 @@ struct DocsVersionSwitcherProps {
     manifest: DocsManifest,
     current_version: String,
 }
-#[component(DocsVersionSwitcher<G>)]
+#[component]
 fn DocsVersionSwitcher<G: Html>(cx: Scope, props: DocsVersionSwitcherProps) -> View<G> {
     // We'll fill this in from the reactive scope
     // Astonishingly, this actually works...
@@ -100,7 +100,7 @@ pub struct DocsContainerProps<G: GenericNode> {
     pub current_version: String,
 }
 
-#[component(DocsContainer<G>)]
+#[component]
 pub fn DocsContainer<G: Html>(cx: Scope, props: DocsContainerProps<G>) -> View<G> {
     let docs_links = props.docs_links.clone();
     let docs_links_clone = docs_links.clone();
diff --git a/website/src/templates/docs/search_bar.rs b/website/src/templates/docs/search_bar.rs
index cb0f6ebaa4..67d668ad11 100644
--- a/website/src/templates/docs/search_bar.rs
+++ b/website/src/templates/docs/search_bar.rs
@@ -27,6 +27,7 @@ use sycamore::prelude::*;
 //     }
 // }
 
+#[component]
 pub fn SearchBar<G: Html>(_cx: Scope) -> View<G> {
     View::empty()
 }
diff --git a/website/src/templates/docs/template.rs b/website/src/templates/docs/template.rs
index 11bc43f253..c7f01c96be 100644
--- a/website/src/templates/docs/template.rs
+++ b/website/src/templates/docs/template.rs
@@ -19,7 +19,7 @@ pub struct DocsPageProps {
 }
 
 #[perseus::template(DocsPage)]
-#[component(DocsPage<G>)]
+#[component]
 pub fn docs_page<G: Html>(cx: Scope, props: DocsPageProps) -> View<G> {
     // These come pre-translated for the current locale
     // Note that all the docs files have a title emblazoned at the top already, so
diff --git a/website/src/templates/index.rs b/website/src/templates/index.rs
index 6c01520bf0..515b3b3938 100644
--- a/website/src/templates/index.rs
+++ b/website/src/templates/index.rs
@@ -382,7 +382,7 @@ fn AnimatedCircularProgressBar<G: Html>(
 }
 
 #[perseus::template(IndexPage)]
-#[component(IndexPage<G>)]
+#[component]
 pub fn index_page<G: Html>(cx: Scope, examples: CodeExamples) -> View<G> {
     // // Fix these on mobile
     // let nav_buttons = match props.nav_buttons {
diff --git a/website/src/templates/plugins.rs b/website/src/templates/plugins.rs
index dd7b12428c..60a2bc71e5 100644
--- a/website/src/templates/plugins.rs
+++ b/website/src/templates/plugins.rs
@@ -46,7 +46,7 @@ struct PluginDetails {
 }
 
 #[perseus::template(PluginsPage)]
-#[component(PluginsPage<G>)]
+#[component]
 fn plugins_page<G: Html>(cx: Scope, props: PluginsPageProps) -> View<G> {
     let plugins = create_signal(cx, props.plugins);
     // This will store the plugins relevant to the user's search (all of them by