diff --git a/pkg/gateway/pages/register/page.templ b/pkg/gateway/pages/register/page.templ
index c4ef86618..29f5cc937 100644
--- a/pkg/gateway/pages/register/page.templ
+++ b/pkg/gateway/pages/register/page.templ
@@ -1,6 +1,7 @@
 package register
 
 import (
+	"github.com/onsonr/sonr/pkg/common/styles/forms"
 	"github.com/onsonr/sonr/pkg/common/styles/layout"
 	"github.com/onsonr/sonr/pkg/common/styles/text"
 )
diff --git a/pkg/gateway/pages/register/page_templ.go b/pkg/gateway/pages/register/page_templ.go
index 4e8685973..6dfe8f63c 100644
--- a/pkg/gateway/pages/register/page_templ.go
+++ b/pkg/gateway/pages/register/page_templ.go
@@ -9,6 +9,7 @@ import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
 import (
+	"github.com/onsonr/sonr/pkg/common/styles/forms"
 	"github.com/onsonr/sonr/pkg/common/styles/layout"
 	"github.com/onsonr/sonr/pkg/common/styles/text"
 )
diff --git a/pkg/vault/internal/pages/dashboard/page.templ b/pkg/vault/internal/pages/dashboard/page.templ
index 5957c292d..b1560f2d2 100644
--- a/pkg/vault/internal/pages/dashboard/page.templ
+++ b/pkg/vault/internal/pages/dashboard/page.templ
@@ -1,6 +1,6 @@
 package dash
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 templ ProfileView() {
 	@layout.Root("Sonr.ID") {
diff --git a/pkg/vault/internal/pages/dashboard/page_templ.go b/pkg/vault/internal/pages/dashboard/page_templ.go
index 9516b90b2..d711f4337 100644
--- a/pkg/vault/internal/pages/dashboard/page_templ.go
+++ b/pkg/vault/internal/pages/dashboard/page_templ.go
@@ -8,7 +8,7 @@ package dash
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 func ProfileView() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
diff --git a/pkg/vault/internal/pages/index/error.templ b/pkg/vault/internal/pages/index/error.templ
index ac9ddf15a..20d7bc2e1 100644
--- a/pkg/vault/internal/pages/index/error.templ
+++ b/pkg/vault/internal/pages/index/error.templ
@@ -1,6 +1,6 @@
 package index
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 templ NoWebauthnErrorView() {
 	@layout.Root("Sonr.ID") {
diff --git a/pkg/vault/internal/pages/index/error_templ.go b/pkg/vault/internal/pages/index/error_templ.go
index 9d517a515..d6965e926 100644
--- a/pkg/vault/internal/pages/index/error_templ.go
+++ b/pkg/vault/internal/pages/index/error_templ.go
@@ -8,7 +8,7 @@ package index
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 func NoWebauthnErrorView() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
diff --git a/pkg/vault/internal/pages/index/page.templ b/pkg/vault/internal/pages/index/page.templ
index 1d69c3626..276571a6a 100644
--- a/pkg/vault/internal/pages/index/page.templ
+++ b/pkg/vault/internal/pages/index/page.templ
@@ -1,6 +1,6 @@
 package index
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 templ InitialView() {
 	@layout.Root("Sonr.ID") {
diff --git a/pkg/vault/internal/pages/index/page_templ.go b/pkg/vault/internal/pages/index/page_templ.go
index 5dc8a9aeb..8f61cffd7 100644
--- a/pkg/vault/internal/pages/index/page_templ.go
+++ b/pkg/vault/internal/pages/index/page_templ.go
@@ -8,7 +8,7 @@ package index
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 func InitialView() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
diff --git a/pkg/vault/internal/pages/wallet/page.templ b/pkg/vault/internal/pages/wallet/page.templ
index 704d29202..7c5121dee 100644
--- a/pkg/vault/internal/pages/wallet/page.templ
+++ b/pkg/vault/internal/pages/wallet/page.templ
@@ -1,6 +1,6 @@
 package wallet
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 templ DepositFundsView() {
 	@layout.Root("Sonr.ID") {
diff --git a/pkg/vault/internal/pages/wallet/page_templ.go b/pkg/vault/internal/pages/wallet/page_templ.go
index f062b0b85..e148afc3e 100644
--- a/pkg/vault/internal/pages/wallet/page_templ.go
+++ b/pkg/vault/internal/pages/wallet/page_templ.go
@@ -8,7 +8,7 @@ package wallet
 import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
-import "github.com/onsonr/sonr/pkg/blocks/layout"
+import "github.com/onsonr/sonr/pkg/common/styles/layout"
 
 func DepositFundsView() templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {