diff --git a/examples/config/config.yaml b/examples/config/config.yaml
deleted file mode 100644
index 570a7c6..0000000
--- a/examples/config/config.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-system:
-  timezone: US/Eastern
-  base_path: examples
-  routes_path: examples/config
-
-logging:
-  destination: \Neuron\Log\Destination\File
-  format: \Neuron\Log\Format\PlainText
-  file: test.log
-  level: debug
-
-cache:
-  enabled: true
-  storage: file
-  path: cache/views
-  ttl: 3600
-  html: true
-  markdown: true
-  json: false
-  xml: false
-  # Garbage collection settings (optional, defaults shown)
-  # gc_probability: 0.01  # 1% chance to run GC on cache write
-  # gc_divisor: 100      # Used with probability for fine-tuning
-
-views:
-  path: views
-
-site:
-  name: 'Neuron'
-  url: 'https://neuron.example.com'
-  description: 'A modern blogging platform built with Neuron.'
-
-blog:
-  path: 'blog'
-  title: 'Neuron Blog'
diff --git a/examples/config/neuron.yaml b/examples/config/neuron.yaml
new file mode 100644
index 0000000..154004f
--- /dev/null
+++ b/examples/config/neuron.yaml
@@ -0,0 +1,57 @@
+system:
+  timezone: US/Eastern
+  base_path: examples
+  routes_path: examples/config
+
+logging:
+  destination: \Neuron\Log\Destination\File
+  format: \Neuron\Log\Format\PlainText
+  file: test.log
+  level: debug
+
+cache:
+  enabled: true
+  storage: file
+  path: cache/views
+  ttl: 3600
+  html: true
+  markdown: true
+  json: false
+  xml: false
+  # Garbage collection settings (optional, defaults shown)
+  # gc_probability: 0.01  # 1% chance to run GC on cache write
+  # gc_divisor: 100      # Used with probability for fine-tuning
+
+views:
+  path: views
+
+site:
+  name: 'Neuron'
+  url: 'https://neuron.example.com'
+  description: 'A modern blogging platform built with Neuron.'
+
+blog:
+  path: 'blog'
+  title: 'Neuron Blog'
+
+# Member Registration and Management Configuration
+member:
+  # Enable or disable user registration
+  # Set to false to prevent new users from signing up
+  registration_enabled: true
+
+  # Default role assigned to new users
+  # Options: admin, editor, author, subscriber
+  default_role: subscriber
+
+  # Require email verification before users can log in
+  # When true, users must verify their email before accessing member areas
+  require_email_verification: true
+
+  # Email verification URL path
+  # This is appended to the site URL to create the verification link
+  verification_url: /verify-email
+
+  # Email verification token expiration time (in minutes)
+  # Tokens older than this will be considered invalid
+  verification_token_expiration_minutes: 60
diff --git a/readme.md b/readme.md
index 7445484..03c1300 100644
--- a/readme.md
+++ b/readme.md
@@ -68,7 +68,7 @@ The installer will:
 1. Create the complete directory structure (app/, config/, db/, public/, resources/, storage/)
 2. Publish all view templates (admin panel, blog, auth, layouts)
 3. Publish application initializers
-4. Create configuration files (config.yaml, routes.yaml, auth.yaml, event-listeners.yaml)
+4. Create configuration files (neuron.yaml, routes.yaml, auth.yaml, event-listeners.yaml)
 5. Generate the front controller (public/index.php)
 6. Set up database migrations
 7. Optionally run migrations to create database tables
@@ -88,7 +88,8 @@ your-project/
 │   ├── Initializers/        # Application initializers
 │   │   ├── AuthInitializer.php
 │   │   ├── MaintenanceInitializer.php
-│   │   └── PasswordResetInitializer.php
+│   │   ├── PasswordResetInitializer.php
+│   │   └── ViewDataInitializer.php
 │   ├── Jobs/                # Background jobs
 │   ├── Listeners/           # Event listeners
 │   ├── Models/              # Domain models
@@ -97,7 +98,7 @@ your-project/
 │
 ├── config/
 │   ├── auth.yaml           # Authentication configuration
-│   ├── config.yaml         # Main application config
+│   ├── neuron.yaml         # Main application config
 │   ├── event-listeners.yaml # Event listener configuration
 │   └── routes.yaml         # Route definitions
 │
@@ -156,7 +157,7 @@ Log in with the admin credentials you created during installation.
 
 ### Optional Configuration
 
-If you need to customize settings, edit `config/config.yaml`:
+If you need to customize settings, edit `config/neuron.yaml`:
 
 ```yaml
 site:
@@ -265,7 +266,7 @@ You can customize routes by editing `config/routes.yaml`.
 
 ### Email
 
-Configure email in `config/config.yaml`:
+Configure email in `config/neuron.yaml`:
 
 ```yaml
 email:
diff --git a/resources/app/Initializers/RegistrationInitializer.php b/resources/app/Initializers/RegistrationInitializer.php
new file mode 100644
index 0000000..faeeddc
--- /dev/null
+++ b/resources/app/Initializers/RegistrationInitializer.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace App\Initializers;
+
+use Neuron\Cms\Auth\EmailVerificationManager;
+use Neuron\Cms\Auth\Filters\MemberAuthenticationFilter;
+use Neuron\Cms\Auth\AuthManager;
+use Neuron\Cms\Auth\PasswordHasher;
+use Neuron\Cms\Repositories\DatabaseEmailVerificationTokenRepository;
+use Neuron\Cms\Repositories\DatabaseUserRepository;
+use Neuron\Cms\Services\Member\RegistrationService;
+use Neuron\Log\Log;
+use Neuron\Patterns\Registry;
+use Neuron\Patterns\IRunnable;
+
+/**
+ * Initialize the member registration system
+ *
+ * Registers the registration services and member authentication filter
+ */
+class RegistrationInitializer implements IRunnable
+{
+	/**
+	 * Run the initializer
+	 * @param array $argv
+	 * @return mixed
+	 * @throws \Exception
+	 */
+	public function run( array $argv = [] ): mixed
+	{
+		// Get Settings from Registry
+		$settings = Registry::getInstance()->get( 'Settings' );
+
+		if( !$settings || !$settings instanceof \Neuron\Data\Setting\SettingManager )
+		{
+			Log::error( "Settings not found in Registry, skipping registration initialization" );
+			return null;
+		}
+
+		// Get Application from Registry
+		$app = Registry::getInstance()->get( 'App' );
+
+		if( !$app || !$app instanceof \Neuron\Mvc\Application )
+		{
+			Log::error( "Application not found in Registry, skipping registration initialization" );
+			return null;
+		}
+
+		// Get AuthManager from Registry (must be initialized first by AuthInitializer)
+		$authManager = Registry::getInstance()->get( 'AuthManager' );
+
+		if( !$authManager )
+		{
+			Log::error( "AuthManager not found in Registry, skipping registration initialization" );
+			return null;
+		}
+
+		// Check if database is configured
+		try
+		{
+			$settingNames = $settings->getSectionSettingNames( 'database' );
+
+			if( !empty( $settingNames ) )
+			{
+				// Initialize registration components
+				$userRepository = new DatabaseUserRepository( $settings );
+				$tokenRepository = new DatabaseEmailVerificationTokenRepository( $settings );
+				$passwordHasher = new PasswordHasher();
+
+				// Get base path for email templates
+				$basePath = $settings->get( 'system', 'base_path' ) ?? getcwd();
+
+				// Get verification URL from settings
+				$siteUrl = $settings->get( 'site', 'url' ) ?? 'http://localhost:8000';
+				$verificationPath = $settings->get( 'member', 'verification_url' ) ?? '/verify-email';
+				$verificationUrl = rtrim( $siteUrl, '/' ) . '/' . ltrim( $verificationPath, '/' );
+
+				// Create EmailVerificationManager
+				$verificationManager = new EmailVerificationManager(
+					$tokenRepository,
+					$userRepository,
+					$settings,
+					$basePath,
+					$verificationUrl
+				);
+
+				// Set token expiration from settings
+				$tokenExpiration = $settings->get( 'member', 'verification_token_expiration_minutes' ) ?? 60;
+				$verificationManager->setTokenExpirationMinutes( $tokenExpiration );
+
+				// Get event emitter if available
+				$emitter = Registry::getInstance()->get( 'EventEmitter' );
+
+				// Create RegistrationService
+				$registrationService = new RegistrationService(
+					$userRepository,
+					$passwordHasher,
+					$verificationManager,
+					$settings,
+					$emitter
+				);
+
+				// Create member authentication filter
+				$requireVerification = $settings->get( 'member', 'require_email_verification' ) ?? true;
+				$memberFilter = new MemberAuthenticationFilter(
+					$authManager,
+					'/login',
+					$requireVerification
+				);
+
+				// Register the member filter with the Router
+				$app->getRouter()->registerFilter( 'member', $memberFilter );
+
+				// Store services in Registry for easy access
+				Registry::getInstance()->set( 'EmailVerificationManager', $verificationManager );
+				Registry::getInstance()->set( 'RegistrationService', $registrationService );
+
+				Log::info( "Registration system initialized successfully" );
+			}
+		}
+		catch( \Exception $e )
+		{
+			Log::error( "Failed to initialize registration system: " . $e->getMessage() );
+		}
+
+		return null;
+	}
+}
diff --git a/resources/app/Initializers/ViewDataInitializer.php b/resources/app/Initializers/ViewDataInitializer.php
new file mode 100644
index 0000000..845a6eb
--- /dev/null
+++ b/resources/app/Initializers/ViewDataInitializer.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Initializers;
+
+use Neuron\Mvc\Views\ViewDataProvider;
+use Neuron\Patterns\IRunnable;
+use Neuron\Patterns\Registry;
+
+/**
+ * Initialize global view data that should be available in all views.
+ *
+ * This initializer demonstrates how to use ViewDataProvider to inject
+ * commonly-needed data into all views without requiring controllers to
+ * manually pass it or views to access the Registry directly.
+ *
+ * The ViewDataProvider eliminates the need for views to directly access
+ * Registry::getInstance(), making views cleaner and more testable.
+ *
+ * Usage:
+ * - Static values are shared once and reused
+ * - Callables are executed on each request (lazy evaluation)
+ * - All shared data is automatically injected into view templates
+ *
+ * @package App\Initializers
+ */
+class ViewDataInitializer implements IRunnable
+{
+	/**
+	 * Run the initializer
+	 *
+	 * Register global view data that should be available in all views.
+	 * Customize this method to share your application's global data.
+	 *
+	 * @param array $argv
+	 * @return mixed
+	 */
+	public function run( array $argv = [] ): mixed
+	{
+		$registry = Registry::getInstance();
+		$provider = ViewDataProvider::getInstance();
+
+		// Site name - pulled from Registry 'name' key
+		$provider->share( 'siteName', function() use ( $registry ) {
+			return $registry->get( 'name' ) ?? 'Neuron CMS';
+		});
+
+		// Application version
+		$provider->share( 'appVersion', function() use ( $registry ) {
+			return $registry->get( 'version' ) ?? '';
+		});
+
+		// Current authenticated user
+		$provider->share( 'currentUser', function() use ( $registry ) {
+			return $registry->get( 'Auth.User' );
+		});
+
+		// Theme from settings with sensible defaults per context
+		$provider->share( 'theme', function() use ( $registry ) {
+			$settings = $registry->get( 'Settings' );
+			return $settings?->get( 'theme', 'default' ) ?? 'sandstone';
+		});
+
+		// Current year (useful for copyright notices)
+		$provider->share( 'currentYear', fn() => date( 'Y' ) );
+
+		// Check if user is authenticated (convenience helper)
+		$provider->share( 'isAuthenticated', function() use ( $registry ) {
+			$authManager = $registry->get( 'AuthManager' );
+			return $authManager && $authManager->isAuthenticated();
+		});
+
+		return null;
+	}
+}
diff --git a/resources/config/auth.yaml b/resources/config/auth.yaml
index 8eeeff4..3752d9e 100644
--- a/resources/config/auth.yaml
+++ b/resources/config/auth.yaml
@@ -38,3 +38,15 @@ auth:
   storage:
     type: file  # file or database (future)
     path: storage/users  # Path for file-based storage
+
+# Member Portal Configuration
+member:
+  # Registration settings
+  registration_enabled: true  # Enable/disable public user registration
+  require_email_verification: true  # Require email verification before account activation
+  default_role: subscriber  # Default role for new members
+
+  # Email verification settings
+  verification_token_expiration_minutes: 60  # Token validity in minutes
+  verification_url: /verify-email  # Verification endpoint URL
+  resend_throttle_seconds: 60  # Minimum time between resend requests
diff --git a/resources/config/database.yaml.example b/resources/config/database.yaml.example
index f708280..1dea521 100644
--- a/resources/config/database.yaml.example
+++ b/resources/config/database.yaml.example
@@ -1,7 +1,7 @@
 # Database Configuration
 #
 # This file provides database configuration for the CMS component.
-# Copy sections to your config/config.yaml
+# Copy sections to your config/neuron.yaml
 
 database:
   # Database adapter (mysql, pgsql, sqlite)
diff --git a/resources/config/maintenance.yaml.example b/resources/config/maintenance.yaml.example
index 7beecf5..03d9db5 100644
--- a/resources/config/maintenance.yaml.example
+++ b/resources/config/maintenance.yaml.example
@@ -1,7 +1,7 @@
 # Maintenance Mode Configuration
 #
 # This file provides configuration defaults for the CMS maintenance mode system.
-# Copy this file to your config directory and rename to config.yaml (or merge with existing config.yaml)
+# Copy this file to your config directory and rename to neuron.yaml (or merge with existing neuron.yaml)
 
 maintenance:
   # Default maintenance message shown to users
diff --git a/resources/config/neuron.yaml b/resources/config/neuron.yaml
new file mode 100644
index 0000000..a8e27d5
--- /dev/null
+++ b/resources/config/neuron.yaml
@@ -0,0 +1,69 @@
+# Neuron CMS Configuration
+# Main configuration file for the Neuron CMS application
+
+system:
+  timezone: UTC
+  base_path: resources
+  routes_path: resources/config
+
+logging:
+  destination: \Neuron\Log\Destination\File
+  format: \Neuron\Log\Format\PlainText
+  file: storage/logs/app.log
+  level: info
+
+cache:
+  enabled: false
+  storage: file
+  path: storage/cache/views
+  ttl: 3600
+  html: true
+  markdown: true
+  json: false
+  xml: false
+
+views:
+  path: resources/views
+
+site:
+  name: 'Neuron CMS'
+  url: 'https://localhost'
+  description: 'A modern content management system built with Neuron.'
+  title: 'Neuron CMS'
+
+# Theme Configuration
+# Controls the Bootswatch theme for different portals
+# Available themes: cerulean, cosmo, cyborg, darkly, flatly, journal, litera,
+# lumen, lux, materia, minty, morph, pulse, quartz, sandstone, simplex, sketchy,
+# slate, solar, spacelab, superhero, united, vapor, yeti, zephyr
+theme:
+  # Admin portal theme (for admin role users)
+  admin: vapor
+
+  # Member portal theme (for subscriber, editor, author roles)
+  subscriber: sandstone
+
+  # Guest theme (for public website and login/registration pages)
+  guest: sandstone
+
+# Member Registration and Management Configuration
+member:
+  # Enable or disable user registration
+  # Set to false to prevent new users from signing up
+  registration_enabled: true
+
+  # Default role assigned to new users
+  # Options: admin, editor, author, subscriber
+  default_role: subscriber
+
+  # Require email verification before users can log in
+  # When true, users must verify their email before accessing member areas
+  require_email_verification: true
+
+  # Email verification URL path
+  # This is appended to the site URL to create the verification link
+  verification_url: /verify-email
+
+  # Email verification token expiration time (in minutes)
+  # Tokens older than this will be considered invalid
+  verification_token_expiration_minutes: 60
diff --git a/resources/config/neuron.yaml.example b/resources/config/neuron.yaml.example
new file mode 100644
index 0000000..047afbf
--- /dev/null
+++ b/resources/config/neuron.yaml.example
@@ -0,0 +1,78 @@
+# Neuron CMS Configuration Example
+# Copy this file to neuron.yaml and customize for your site
+# Main configuration file for the Neuron CMS application
+
+system:
+  timezone: UTC  # Server timezone (e.g., America/New_York, Europe/London, UTC)
+  base_path: resources  # Base path for resources
+  routes_path: resources/config  # Path to routes configuration
+
+logging:
+  destination: \Neuron\Log\Destination\File  # Log destination class
+  format: \Neuron\Log\Format\PlainText  # Log format class
+  file: storage/logs/app.log  # Log file path
+  level: info  # Log level: debug, info, warning, error
+
+cache:
+  enabled: true  # Enable view caching
+  storage: file  # Cache storage type
+  path: storage/cache/views  # Cache storage path
+  ttl: 3600  # Cache time-to-live in seconds
+  html: true  # Cache HTML views
+  markdown: true  # Cache Markdown views
+  json: false  # Cache JSON views
+  xml: false  # Cache XML views
+
+views:
+  path: resources/views  # Path to view templates
+
+site:
+  name: 'Neuron CMS'  # Site name
+  url: 'https://example.com'  # Site URL (without trailing slash)
+  description: 'A modern content management system built with Neuron.'  # Site description
+  title: 'Neuron CMS'  # Default page title
+
+# Theme Configuration
+# Controls the Bootswatch theme for different portals
+# Themes are role-based: admin, subscriber (member), and guest (public/auth)
+#
+# Available Bootswatch 5.3+ themes:
+# - cerulean: A calm blue sky theme
+# - cosmo: An ode to Metro
+# - cyborg: Jet black and electric blue
+# - darkly: Flatly in night mode
+# - flatly: Flat and modern
+# - journal: Crisp like a new sheet of paper
+# - litera: The medium is the message
+# - lumen: Light and shadow
+# - lux: A touch of class
+# - materia: Material is the metaphor
+# - minty: A fresh feel
+# - morph: A neumorphic design
+# - pulse: A trace of purple
+# - quartz: A glassmorphism design
+# - sandstone: A touch of warmth
+# - simplex: Mini and minimalist
+# - sketchy: A hand-drawn look
+# - slate: Shades of gunmetal gray
+# - solar: A spin on Solarized
+# - spacelab: Silvery and sleek
+# - superhero: The brave and the blue
+# - united: Ubuntu orange and unique font
+# - vapor: A cyberpunk aesthetic
+# - yeti: A friendly foundation
+# - zephyr: Breezy and beautiful
+#
+# Preview themes at: https://bootswatch.com/
+theme:
+  # Admin portal theme (for users with admin role)
+  # Recommended: vapor (dark), darkly, cyborg, slate
+  admin: vapor
+
+  # Member portal theme (for users with subscriber, editor, author roles)
+  # Recommended: sandstone, flatly, cosmo, lux, materia
+  subscriber: sandstone
+
+  # Guest theme (for public website and login/registration pages)
+  # Recommended: sandstone, flatly, cosmo, litera, lumen, minty
+  guest: sandstone
diff --git a/resources/config/routes.yaml b/resources/config/routes.yaml
index a7d1575..68655a0 100644
--- a/resources/config/routes.yaml
+++ b/resources/config/routes.yaml
@@ -250,3 +250,55 @@ routes:
     method: GET
     route: /rss
     controller: Neuron\Cms\Controllers\Blog@feed
+
+  # Member Registration Routes
+  register:
+    method: GET
+    route: /register
+    controller: Neuron\Cms\Controllers\Member\Registration@showRegistrationForm
+
+  register_post:
+    method: POST
+    route: /register
+    controller: Neuron\Cms\Controllers\Member\Registration@processRegistration
+
+  verify_email:
+    method: GET
+    route: /verify-email
+    controller: Neuron\Cms\Controllers\Member\Registration@verify
+
+  verify_email_sent:
+    method: GET
+    route: /verify-email-sent
+    controller: Neuron\Cms\Controllers\Member\Registration@showVerificationSent
+
+  resend_verification:
+    method: POST
+    route: /resend-verification
+    controller: Neuron\Cms\Controllers\Member\Registration@resendVerification
+
+  # Member Dashboard Routes
+  member:
+    method: GET
+    route: /member
+    controller: Neuron\Cms\Controllers\Member\Dashboard@index
+    filter: member
+
+  member_dashboard:
+    method: GET
+    route: /member/dashboard
+    controller: Neuron\Cms\Controllers\Member\Dashboard@index
+    filter: member
+
+  # Member Profile Routes
+  member_profile:
+    method: GET
+    route: /member/profile
+    controller: Neuron\Cms\Controllers\Member\Profile@edit
+    filter: member
+
+  member_profile_update:
+    method: PUT
+    route: /member/profile
+    controller: Neuron\Cms\Controllers\Member\Profile@update
+    filter: member
diff --git a/resources/database/migrate/20250111000000_create_users_table.php b/resources/database/migrate/20250111000000_create_users_table.php
new file mode 100644
index 0000000..70d2774
--- /dev/null
+++ b/resources/database/migrate/20250111000000_create_users_table.php
@@ -0,0 +1,50 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+/**
+ * Create users and password_reset_tokens tables
+ */
+class CreateUsersTable extends AbstractMigration
+{
+	/**
+	 * Create users and password_reset_tokens tables
+	 */
+	public function change()
+	{
+		// Create users table
+		$usersTable = $this->table( 'users' );
+
+		$usersTable->addColumn( 'username', 'string', [ 'limit' => 255 ] )
+			->addColumn( 'email', 'string', [ 'limit' => 255 ] )
+			->addColumn( 'password_hash', 'string', [ 'limit' => 255 ] )
+			->addColumn( 'role', 'string', [ 'limit' => 50, 'default' => 'subscriber' ] )
+			->addColumn( 'status', 'string', [ 'limit' => 50, 'default' => 'active' ] )
+			->addColumn( 'email_verified', 'boolean', [ 'default' => false ] )
+			->addColumn( 'two_factor_secret', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'remember_token', 'string', [ 'limit' => 255, 'null' => true ] )
+			->addColumn( 'failed_login_attempts', 'integer', [ 'default' => 0 ] )
+			->addColumn( 'locked_until', 'timestamp', [ 'null' => true ] )
+			->addColumn( 'last_login_at', 'timestamp', [ 'null' => true ] )
+			->addColumn( 'timezone', 'string', [ 'limit' => 50, 'default' => 'UTC' ] )
+			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
+			->addColumn( 'updated_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP', 'update' => 'CURRENT_TIMESTAMP' ] )
+			->addIndex( [ 'username' ], [ 'unique' => true ] )
+			->addIndex( [ 'email' ], [ 'unique' => true ] )
+			->addIndex( [ 'remember_token' ] )
+			->addIndex( [ 'status' ] )
+			->create();
+
+		// Create password_reset_tokens table
+		$tokensTable = $this->table( 'password_reset_tokens' );
+
+		$tokensTable->addColumn( 'email', 'string', [ 'limit' => 255 ] )
+			->addColumn( 'token', 'string', [ 'limit' => 64 ] )
+			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
+			->addColumn( 'expires_at', 'timestamp', [ 'null' => false ] )
+			->addIndex( [ 'email' ] )
+			->addIndex( [ 'token' ] )
+			->addIndex( [ 'expires_at' ] )
+			->create();
+	}
+}
diff --git a/resources/database/migrate/20250112000000_create_email_verification_tokens_table.php b/resources/database/migrate/20250112000000_create_email_verification_tokens_table.php
new file mode 100644
index 0000000..2e5a77a
--- /dev/null
+++ b/resources/database/migrate/20250112000000_create_email_verification_tokens_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+/**
+ * Create email_verification_tokens table
+ */
+class CreateEmailVerificationTokensTable extends AbstractMigration
+{
+	/**
+	 * Create email_verification_tokens table
+	 */
+	public function change()
+	{
+		$table = $this->table( 'email_verification_tokens' );
+
+		$table->addColumn( 'user_id', 'integer', [ 'null' => false ] )
+			->addColumn( 'token', 'string', [ 'limit' => 64 ] )
+			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
+			->addColumn( 'expires_at', 'timestamp', [ 'null' => false ] )
+			->addIndex( [ 'user_id' ] )
+			->addIndex( [ 'token' ], [ 'unique' => true ] )
+			->addIndex( [ 'expires_at' ] )
+			->addForeignKey( 'user_id', 'users', 'id', [ 'delete' => 'CASCADE', 'update' => 'NO_ACTION' ] )
+			->create();
+	}
+}
diff --git a/resources/views/emails/email-verification.php b/resources/views/emails/email-verification.php
new file mode 100644
index 0000000..d568efe
--- /dev/null
+++ b/resources/views/emails/email-verification.php
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Verify Your Email - <?= htmlspecialchars($SiteName) ?></title>
+	<style>
+		/* Inline styles for better email client compatibility */
+		body {
+			font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+			line-height: 1.6;
+			color: #333333;
+			margin: 0;
+			padding: 0;
+			background-color: #f4f4f4;
+		}
+		.email-container {
+			max-width: 600px;
+			margin: 20px auto;
+			background-color: #ffffff;
+			border-radius: 8px;
+			overflow: hidden;
+			box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+		}
+		.email-header {
+			background: linear-gradient(135deg, #10b981 0%, #059669 100%);
+			color: #ffffff;
+			padding: 40px 20px;
+			text-align: center;
+		}
+		.email-header h1 {
+			margin: 0;
+			font-size: 28px;
+			font-weight: 600;
+		}
+		.email-body {
+			padding: 40px 30px;
+			background-color: #ffffff;
+		}
+		.email-body p {
+			margin: 0 0 16px 0;
+			color: #555555;
+		}
+		.email-body p:last-child {
+			margin-bottom: 0;
+		}
+		.greeting {
+			font-size: 18px;
+			font-weight: 600;
+			color: #333333;
+			margin-bottom: 20px;
+		}
+		.cta-button {
+			display: inline-block;
+			padding: 14px 32px;
+			margin: 24px 0;
+			background-color: #10b981;
+			color: #ffffff;
+			text-decoration: none;
+			border-radius: 6px;
+			font-weight: 600;
+			transition: background-color 0.3s ease;
+		}
+		.cta-button:hover {
+			background-color: #059669;
+		}
+		.cta-container {
+			text-align: center;
+		}
+		.link-box {
+			background-color: #f9fafb;
+			border: 1px solid #e5e7eb;
+			border-radius: 6px;
+			padding: 16px;
+			margin: 20px 0;
+			word-break: break-all;
+		}
+		.link-box a {
+			color: #10b981;
+			text-decoration: none;
+			font-size: 14px;
+		}
+		.security-notice {
+			background-color: #dbeafe;
+			border-left: 4px solid #3b82f6;
+			padding: 16px;
+			margin: 24px 0;
+			border-radius: 4px;
+		}
+		.security-notice p {
+			margin: 0;
+			color: #1e40af;
+			font-size: 14px;
+		}
+		.security-notice strong {
+			color: #1e3a8a;
+		}
+		.email-footer {
+			background-color: #f9fafb;
+			padding: 30px 20px;
+			text-align: center;
+			color: #6b7280;
+			font-size: 14px;
+			border-top: 1px solid #e5e7eb;
+		}
+		.email-footer p {
+			margin: 8px 0;
+		}
+		.divider {
+			height: 1px;
+			background-color: #e5e7eb;
+			margin: 24px 0;
+		}
+		@media only screen and (max-width: 600px) {
+			.email-container {
+				margin: 0;
+				border-radius: 0;
+			}
+			.email-body {
+				padding: 30px 20px;
+			}
+		}
+	</style>
+</head>
+<body>
+	<div class="email-container">
+		<!-- Header -->
+		<div class="email-header">
+			<h1>Verify Your Email Address</h1>
+		</div>
+
+		<!-- Body -->
+		<div class="email-body">
+			<p class="greeting">Hello<?= isset($Username) ? ', ' . htmlspecialchars($Username) : '' ?>!</p>
+
+			<p>
+				Thank you for registering with <strong><?= htmlspecialchars($SiteName) ?></strong>.
+				To complete your registration and activate your account, please verify your email address by clicking the button below:
+			</p>
+
+			<div class="cta-container">
+				<a href="<?= htmlspecialchars($VerificationLink) ?>" class="cta-button">Verify Email Address</a>
+			</div>
+
+			<p style="text-align: center; font-size: 14px; color: #6b7280;">
+				Or copy and paste this link into your browser:
+			</p>
+
+			<div class="link-box">
+				<a href="<?= htmlspecialchars($VerificationLink) ?>"><?= htmlspecialchars($VerificationLink) ?></a>
+			</div>
+
+			<div class="security-notice">
+				<p>
+					<strong>Important:</strong> This verification link will expire in <?= htmlspecialchars($ExpirationMinutes) ?> minutes.
+					If you did not create an account with us, please ignore this email.
+				</p>
+			</div>
+
+			<div class="divider"></div>
+
+			<p>
+				Once you verify your email, you'll be able to log in and access all member features.
+			</p>
+
+			<p>
+				If you're having trouble clicking the verification button, copy and paste the URL above into your web browser.
+			</p>
+
+			<p>
+				Welcome aboard!<br>
+				<strong>The <?= htmlspecialchars($SiteName) ?> Team</strong>
+			</p>
+		</div>
+
+		<!-- Footer -->
+		<div class="email-footer">
+			<p>&copy; <?= date('Y') ?> <?= htmlspecialchars($SiteName) ?>. All rights reserved.</p>
+			<p>This is an automated message. Please do not reply to this email.</p>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/resources/views/home/index.php b/resources/views/home/index.php
index f75fe14..b827741 100644
--- a/resources/views/home/index.php
+++ b/resources/views/home/index.php
@@ -10,32 +10,34 @@
 			<?php endif; ?>
 
 			<div class="d-grid gap-2 d-sm-flex justify-content-sm-center mb-5">
-				<a href="<?= route_path('blog') ?>" class="btn btn-primary btn-lg px-4 gap-3">Visit Blog</a>
-				<a href="<?= route_path('admin') ?>" class="btn btn-outline-secondary btn-lg px-4">Admin Dashboard</a>
+				<a href="<?= route_path('blog') ?>" class="btn btn-primary btn-lg px-4 gap-3">Blog</a>
+				<?php if( !empty( $RegistrationEnabled ) ): ?>
+					<a href="<?= route_path('register') ?>" class="btn btn-success btn-lg px-4 gap-3">Sign Up</a>
+				<?php endif; ?>
 			</div>
 
 			<div class="row mt-5">
 				<div class="col-md-4">
 					<div class="card h-100 border-0 shadow-sm">
 						<div class="card-body text-center">
-							<h3 class="h5 card-title mb-3">Content Management</h3>
-							<p class="card-text text-muted">Create and manage blog posts, categories, and tags with an intuitive admin interface.</p>
+							<h3 class="h5 card-title mb-3">Blog</h3>
+							<p class="card-text text-muted">Fully functional blog with posts, categories, and tags.</p>
 						</div>
 					</div>
 				</div>
 				<div class="col-md-4">
 					<div class="card h-100 border-0 shadow-sm">
 						<div class="card-body text-center">
-							<h3 class="h5 card-title mb-3">User Management</h3>
-							<p class="card-text text-muted">Manage users with role-based access control and secure authentication.</p>
+							<h3 class="h5 card-title mb-3">Member Portal</h3>
+							<p class="card-text text-muted">Customizable member section with profile and timezone support.</p>
 						</div>
 					</div>
 				</div>
 				<div class="col-md-4">
 					<div class="card h-100 border-0 shadow-sm">
 						<div class="card-body text-center">
-							<h3 class="h5 card-title mb-3">Modern & Fast</h3>
-							<p class="card-text text-muted">Built with PHP 8.4+ using modern practices and the Neuron MVC framework.</p>
+							<h3 class="h5 card-title mb-3">Admin Portal</h3>
+							<p class="card-text text-muted">Manage users and blog posts in an easy-to-use back end.</p>
 						</div>
 					</div>
 				</div>
diff --git a/resources/views/layouts/admin.php b/resources/views/layouts/admin.php
index ace0a8c..7a24717 100644
--- a/resources/views/layouts/admin.php
+++ b/resources/views/layouts/admin.php
@@ -6,7 +6,7 @@
 	<title><?= htmlspecialchars($Title ?? 'Admin') ?></title>
 	<meta name="description" content="<?= htmlspecialchars($Description ?? '') ?>">
 
-	<link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.7/dist/vapor/bootstrap.min.css" rel="stylesheet">
+	<link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.7/dist/<?= htmlspecialchars($theme) ?>/bootstrap.min.css" rel="stylesheet">
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet">
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
 	<style>
@@ -19,7 +19,7 @@
 	<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
 		<div class="container-fluid">
 			<a class="navbar-brand" href="<?= route_path('admin_dashboard') ?>">
-				<?= htmlspecialchars($name ?? 'Neuron CMS') ?> Admin
+				<?= htmlspecialchars($siteName) ?> Admin
 			</a>
 			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
 				<span class="navbar-toggler-icon"></span>
diff --git a/resources/views/layouts/auth.php b/resources/views/layouts/auth.php
index 9478bf2..5419b21 100644
--- a/resources/views/layouts/auth.php
+++ b/resources/views/layouts/auth.php
@@ -6,7 +6,7 @@
 	<title><?= htmlspecialchars($Title ?? 'Login') ?></title>
 	<meta name="description" content="<?= htmlspecialchars($Description ?? '') ?>">
 
-	<link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.7/dist/sandstone/bootstrap.min.css" rel="stylesheet">
+	<link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.7/dist/<?= htmlspecialchars($theme) ?>/bootstrap.min.css" rel="stylesheet">
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
 </head>
 <body class="bg-primary min-vh-100 d-flex align-items-center justify-content-center p-4">
@@ -15,7 +15,7 @@
 			<div class="col-12 col-sm-10 col-md-8 col-lg-6 col-xl-4">
 				<div class="card shadow-lg p-4">
 					<div class="text-center mb-4">
-			<h1 class="h3 mb-2"><?= htmlspecialchars($name ?? 'Neuron CMS') ?></h1>
+			<h1 class="h3 mb-2"><?= htmlspecialchars($siteName) ?></h1>
 			<p class="text-muted"><?= htmlspecialchars($PageSubtitle ?? 'Admin Login') ?></p>
 		</div>
 
diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php
index b0e3ad6..72c37fa 100644
--- a/resources/views/layouts/default.php
+++ b/resources/views/layouts/default.php
@@ -1,6 +1,4 @@
-<?php
-use Neuron\Patterns\Registry;
-?>
+<!DOCTYPE html>
 <html lang="en">
 <head>
 	<meta charset="utf-8">
@@ -21,7 +19,7 @@
 	<link rel="alternate" type="application/rss+xml" title="RSS Feed" href="<?= route_path('rss') ?>">
 	<meta name="application-name" content="">
 
-	<link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.7/dist/sandstone/bootstrap.min.css" rel="stylesheet">
+	<link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.7/dist/<?= htmlspecialchars($theme) ?>/bootstrap.min.css" rel="stylesheet">
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet">
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
@@ -31,7 +29,7 @@
 	<div class="container">
 		<a class="navbar-brand d-flex align-items-center" href="<?= route_path('home') ?>">
 			<img src="/icon.png" alt="Logo" height="28" class="me-2" />
-			<span><?= Registry::getInstance()->get( 'name' ) ?></span>
+			<span><?= htmlspecialchars($siteName) ?></span>
 		</a>
 		<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
 			<span class="navbar-toggler-icon"></span>
@@ -47,9 +45,11 @@
 				<i class="bi bi-rss-fill text-warning"></i> Subscribe via RSS
 			</a>
 		</div>
+		<?php if( $appVersion ): ?>
 		<div class="text-center small">
-			<?= Registry::getInstance()->get( 'version' ) ?>
+			<?= htmlspecialchars($appVersion) ?>
 		</div>
+		<?php endif; ?>
 		<div class="text-center small">
 			Powered by <a href="https://neuronphp.com" target="_blank">NeuronPHP</a>.
 		</div>
diff --git a/resources/views/layouts/member.php b/resources/views/layouts/member.php
new file mode 100644
index 0000000..05c1e36
--- /dev/null
+++ b/resources/views/layouts/member.php
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+	<link rel="icon" type="image/png" sizes="32x32" href="/favicon.png">
+
+	<title><?= isset( $Title ) ? $Title : 'Member Portal' ?></title>
+	<meta name="description" content="<?= isset( $Description ) ? $Description : '' ?>">
+
+	<link href="https://cdn.jsdelivr.net/npm/bootswatch@5.3.7/dist/<?= htmlspecialchars($theme) ?>/bootstrap.min.css" rel="stylesheet">
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" rel="stylesheet">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.min.js"></script>
+	<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
+</head>
+<body class="pb-5">
+<nav class="navbar navbar-expand-lg navbar-dark bg-primary fixed-top" role="navigation">
+	<div class="container-fluid">
+		<a class="navbar-brand d-flex align-items-center" href="<?= route_path('member_dashboard') ?>">
+			<img src="/icon.png" alt="Logo" height="28" class="me-2" />
+			<span><?= htmlspecialchars($siteName) ?> - Member Portal</span>
+		</a>
+		<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+			<span class="navbar-toggler-icon"></span>
+		</button>
+		<div class="collapse navbar-collapse" id="navbarNav">
+			<ul class="navbar-nav ms-auto">
+				<?php if( $currentUser ): ?>
+					<li class="nav-item">
+						<a class="nav-link" href="<?= route_path('member_dashboard') ?>">
+							<i class="bi bi-house-door"></i> Dashboard
+						</a>
+					</li>
+					<li class="nav-item dropdown">
+						<button class="btn nav-link d-flex align-items-center border-0" type="button" id="userDropdown" data-bs-toggle="dropdown" aria-expanded="false">
+							<img src="<?= gravatar_url($currentUser->getEmail(), 32) ?>" class="rounded-circle" width="32" height="32" alt="<?= htmlspecialchars($currentUser->getUsername()) ?>" onerror="this.onerror=null; this.src='data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 width=%2232%22 height=%2232%22 fill=%22%23ffffff%22 viewBox=%220 0 16 16%22><circle cx=%228%22 cy=%228%22 r=%228%22 fill=%22%236c757d%22/><path d=%22M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0zm4 8c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4zm-1-.004c-.001-.246-.154-.986-.832-1.664C11.516 10.68 10.289 10 8 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10z%22 fill=%22%23ffffff%22/></svg>';">
+						</button>
+						<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
+							<li><h6 class="dropdown-header"><?= htmlspecialchars($currentUser->getUsername()) ?></h6></li>
+							<li><hr class="dropdown-divider"></li>
+							<li><a class="dropdown-item" href="<?= route_path('member_profile') ?>"><i class="bi bi-person me-2"></i>Profile &amp; Settings</a></li>
+							<li><hr class="dropdown-divider"></li>
+							<li>
+								<form method="POST" action="<?= route_path('logout') ?>" class="px-2">
+									<?= csrf_field() ?>
+									<button type="submit" class="dropdown-item"><i class="bi bi-box-arrow-right me-2"></i>Logout</button>
+								</form>
+							</li>
+						</ul>
+					</li>
+				<?php endif; ?>
+			</ul>
+		</div>
+	</div>
+</nav>
+<div class="container-fluid pt-5 mt-4">
+	<?= $content ?>
+	<hr class="mt-5">
+	<footer class="footer" role="presentation">
+		<?php if( $appVersion ): ?>
+		<div class="text-center small">
+			<?= htmlspecialchars($appVersion) ?>
+		</div>
+		<?php endif; ?>
+		<div class="text-center small">
+			Powered by <a href="https://neuronphp.com" target="_blank">NeuronPHP</a>.
+		</div>
+	</footer>
+</div>
+</body>
+</html>
diff --git a/resources/views/member/dashboard/index.php b/resources/views/member/dashboard/index.php
new file mode 100644
index 0000000..d9e2f93
--- /dev/null
+++ b/resources/views/member/dashboard/index.php
@@ -0,0 +1,64 @@
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-12">
+			<h1 class="mb-4">Member Dashboard</h1>
+
+			<div class="alert alert-success" role="alert">
+				<h4 class="alert-heading"><?= htmlspecialchars( $WelcomeMessage ?? 'Welcome!' ) ?></h4>
+				<p class="mb-0">You are logged in to your member account.</p>
+			</div>
+		</div>
+	</div>
+
+	<div class="row mt-4">
+		<div class="col-md-4 mb-4">
+			<div class="card">
+				<div class="card-body">
+					<h5 class="card-title">
+						<i class="bi bi-person-circle me-2"></i>Profile
+					</h5>
+					<p class="card-text">Manage your account settings and personal information.</p>
+					<a href="<?= route_path('member_profile') ?>" class="btn btn-primary btn-sm">
+						Edit Profile
+					</a>
+				</div>
+			</div>
+		</div>
+
+		<div class="col-md-4 mb-4">
+			<div class="card">
+				<div class="card-body">
+					<h5 class="card-title">
+						<i class="bi bi-shield-check me-2"></i>Account Status
+					</h5>
+					<p class="card-text">
+						<strong>Username:</strong> <?= htmlspecialchars( $User->getUsername() ) ?><br>
+						<strong>Email:</strong> <?= htmlspecialchars( $User->getEmail() ) ?><br>
+						<strong>Status:</strong>
+						<?php if( $User->isEmailVerified() ): ?>
+							<span class="badge bg-success">Verified</span>
+						<?php else: ?>
+							<span class="badge bg-warning">Unverified</span>
+						<?php endif; ?>
+					</p>
+				</div>
+			</div>
+		</div>
+
+		<div class="col-md-4 mb-4">
+			<div class="card">
+				<div class="card-body">
+					<h5 class="card-title">
+						<i class="bi bi-clock-history me-2"></i>Account Info
+					</h5>
+					<p class="card-text">
+						<strong>Member Since:</strong>
+						<?= $User->getCreatedAt() ? $User->getCreatedAt()->format('F j, Y') : 'N/A' ?><br>
+						<strong>Last Login:</strong>
+						<?= $User->getLastLoginAt() ? $User->getLastLoginAt()->format('F j, Y g:i A') : 'Never' ?>
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/resources/views/member/profile/edit.php b/resources/views/member/profile/edit.php
new file mode 100644
index 0000000..d13c0fc
--- /dev/null
+++ b/resources/views/member/profile/edit.php
@@ -0,0 +1,118 @@
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-lg-8">
+			<h1 class="mb-4">Edit Profile</h1>
+
+			<?php if( isset( $success ) && $success ): ?>
+				<div class="alert alert-success alert-dismissible fade show">
+					<?= htmlspecialchars( $success ) ?>
+					<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+				</div>
+			<?php endif; ?>
+
+			<?php if( isset( $error ) && $error ): ?>
+				<div class="alert alert-danger alert-dismissible fade show">
+					<?= htmlspecialchars( $error ) ?>
+					<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+				</div>
+			<?php endif; ?>
+
+			<div class="card">
+				<div class="card-body">
+					<form method="POST" action="<?= route_path('member_profile_update') ?>">
+						<?= csrf_field() ?>
+						<input type="hidden" name="_method" value="PUT">
+
+						<div class="mb-3">
+							<label for="username" class="form-label">Username</label>
+							<input
+								type="text"
+								id="username"
+								class="form-control"
+								value="<?= htmlspecialchars( $User->getUsername() ) ?>"
+								disabled
+							>
+							<small class="form-text text-muted">Username cannot be changed</small>
+						</div>
+
+						<div class="mb-3">
+							<label for="email" class="form-label">Email Address</label>
+							<input
+								type="email"
+								id="email"
+								name="email"
+								class="form-control"
+								value="<?= htmlspecialchars( $User->getEmail() ) ?>"
+								required
+							>
+						</div>
+
+						<div class="mb-3">
+							<label for="timezone" class="form-label">Timezone</label>
+							<select id="timezone" name="timezone" class="form-select">
+								<?php foreach( $timezones as $tz ): ?>
+									<option
+										value="<?= htmlspecialchars( $tz ) ?>"
+										<?= $tz === $User->getTimezone() ? 'selected' : '' ?>
+									>
+										<?= htmlspecialchars( $tz ) ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+						</div>
+
+						<hr class="my-4">
+
+						<h5 class="mb-3">Change Password</h5>
+						<p class="text-muted small">Leave these fields blank if you don't want to change your password.</p>
+
+						<div class="mb-3">
+							<label for="current_password" class="form-label">Current Password</label>
+							<input
+								type="password"
+								id="current_password"
+								name="current_password"
+								class="form-control"
+								autocomplete="current-password"
+							>
+						</div>
+
+						<div class="mb-3">
+							<label for="new_password" class="form-label">New Password</label>
+							<input
+								type="password"
+								id="new_password"
+								name="new_password"
+								class="form-control"
+								minlength="8"
+								autocomplete="new-password"
+							>
+							<small class="form-text text-muted">Minimum 8 characters</small>
+						</div>
+
+						<div class="mb-4">
+							<label for="confirm_password" class="form-label">Confirm New Password</label>
+							<input
+								type="password"
+								id="confirm_password"
+								name="confirm_password"
+								class="form-control"
+								minlength="8"
+								autocomplete="new-password"
+							>
+						</div>
+
+						<div class="d-flex justify-content-between">
+							<a href="<?= route_path('member_dashboard') ?>" class="btn btn-secondary">
+								Cancel
+							</a>
+							<button type="submit" class="btn btn-primary">
+								Save Changes
+							</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/resources/views/member/registration/email-verified.php b/resources/views/member/registration/email-verified.php
new file mode 100644
index 0000000..093f6d9
--- /dev/null
+++ b/resources/views/member/registration/email-verified.php
@@ -0,0 +1,42 @@
+<div class="row justify-content-center">
+	<div class="col-md-6 col-lg-5">
+		<div class="card shadow">
+			<div class="card-body p-5 text-center">
+				<?php if( isset( $Success ) && $Success ): ?>
+					<div class="mb-4">
+						<i class="bi bi-check-circle-fill text-success" style="font-size: 4rem;"></i>
+					</div>
+
+					<h2 class="card-title mb-3">Email Verified!</h2>
+
+					<p class="text-muted mb-4">
+						<?= htmlspecialchars( $Message ?? 'Your email has been verified successfully!' ) ?>
+					</p>
+
+					<a href="<?= route_path('login') ?>" class="btn btn-primary w-100">
+						Continue to Login
+					</a>
+				<?php else: ?>
+					<div class="mb-4">
+						<i class="bi bi-x-circle-fill text-danger" style="font-size: 4rem;"></i>
+					</div>
+
+					<h2 class="card-title mb-3">Verification Failed</h2>
+
+					<p class="text-muted mb-4">
+						<?= htmlspecialchars( $Message ?? 'This verification link is invalid or has expired.' ) ?>
+					</p>
+
+					<div class="d-grid gap-2">
+						<a href="<?= route_path('verify_email_sent') ?>" class="btn btn-primary">
+							Request New Verification Email
+						</a>
+						<a href="<?= route_path('register') ?>" class="btn btn-outline-secondary">
+							Back to Registration
+						</a>
+					</div>
+				<?php endif; ?>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/resources/views/member/registration/register.php b/resources/views/member/registration/register.php
new file mode 100644
index 0000000..fd81f16
--- /dev/null
+++ b/resources/views/member/registration/register.php
@@ -0,0 +1,85 @@
+<div class="row justify-content-center">
+	<div class="col-md-6 col-lg-5">
+		<div class="card shadow">
+			<div class="card-body p-5">
+				<h2 class="card-title text-center mb-4">Create Account</h2>
+
+				<?php if( isset( $Error ) && $Error ): ?>
+					<div class="alert alert-danger"><?= htmlspecialchars( $Error ) ?></div>
+				<?php endif; ?>
+
+				<?php if( isset( $Success ) && $Success ): ?>
+					<div class="alert alert-success"><?= htmlspecialchars( $Success ) ?></div>
+				<?php endif; ?>
+
+				<form method="POST" action="<?= route_path('register_post') ?>">
+					<?= csrf_field() ?>
+
+					<div class="mb-3">
+						<label for="username" class="form-label">Username</label>
+						<input
+							type="text"
+							id="username"
+							name="username"
+							class="form-control"
+							placeholder="Choose a username"
+							required
+							autofocus
+							pattern="[a-zA-Z0-9_]+"
+							minlength="3"
+							maxlength="50"
+						>
+						<small class="form-text text-muted">3-50 characters, letters, numbers, and underscores only</small>
+					</div>
+
+					<div class="mb-3">
+						<label for="email" class="form-label">Email Address</label>
+						<input
+							type="email"
+							id="email"
+							name="email"
+							class="form-control"
+							placeholder="your.email@example.com"
+							required
+						>
+					</div>
+
+					<div class="mb-3">
+						<label for="password" class="form-label">Password</label>
+						<input
+							type="password"
+							id="password"
+							name="password"
+							class="form-control"
+							placeholder="Choose a strong password"
+							required
+							minlength="8"
+						>
+						<small class="form-text text-muted">Minimum 8 characters, include uppercase, lowercase, and numbers</small>
+					</div>
+
+					<div class="mb-4">
+						<label for="password_confirmation" class="form-label">Confirm Password</label>
+						<input
+							type="password"
+							id="password_confirmation"
+							name="password_confirmation"
+							class="form-control"
+							placeholder="Re-enter your password"
+							required
+							minlength="8"
+						>
+					</div>
+
+					<button type="submit" class="btn btn-primary w-100 mb-3">
+						Create Account
+					</button>
+
+					<div class="text-center">
+						<small>Already have an account? <a href="<?= route_path('login') ?>">Sign in</a></small>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/resources/views/member/registration/registration-disabled.php b/resources/views/member/registration/registration-disabled.php
new file mode 100644
index 0000000..f85979c
--- /dev/null
+++ b/resources/views/member/registration/registration-disabled.php
@@ -0,0 +1,26 @@
+<div class="row justify-content-center">
+	<div class="col-md-6 col-lg-5">
+		<div class="card shadow">
+			<div class="card-body p-5 text-center">
+				<div class="mb-4">
+					<i class="bi bi-lock-fill text-warning" style="font-size: 4rem;"></i>
+				</div>
+
+				<h2 class="card-title mb-3">Registration Disabled</h2>
+
+				<p class="text-muted mb-4">
+					User registration is currently disabled. Please contact the administrator if you need access.
+				</p>
+
+				<div class="d-grid gap-2">
+					<a href="<?= route_path('login') ?>" class="btn btn-primary">
+						Go to Login
+					</a>
+					<a href="<?= route_path('home') ?>" class="btn btn-outline-secondary">
+						Return to Homepage
+					</a>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/resources/views/member/registration/verify-email-sent.php b/resources/views/member/registration/verify-email-sent.php
new file mode 100644
index 0000000..2bf6acc
--- /dev/null
+++ b/resources/views/member/registration/verify-email-sent.php
@@ -0,0 +1,45 @@
+<div class="row justify-content-center">
+	<div class="col-md-6 col-lg-5">
+		<div class="card shadow">
+			<div class="card-body p-5 text-center">
+				<div class="mb-4">
+					<i class="bi bi-envelope-check-fill text-success" style="font-size: 4rem;"></i>
+				</div>
+
+				<h2 class="card-title mb-3">Check Your Email</h2>
+
+				<?php if( isset( $Success ) && $Success ): ?>
+					<div class="alert alert-success text-start"><?= htmlspecialchars( $Success ) ?></div>
+				<?php endif; ?>
+
+				<p class="text-muted mb-4">
+					We've sent a verification email to your address. Please click the link in the email to activate your account.
+				</p>
+
+				<p class="text-muted small mb-4">
+					<strong>Didn't receive the email?</strong> Check your spam folder or request a new verification email below.
+				</p>
+
+				<form method="POST" action="<?= route_path('resend_verification') ?>" class="mb-3">
+					<?= csrf_field() ?>
+					<div class="input-group">
+						<input
+							type="email"
+							name="email"
+							class="form-control"
+							placeholder="Enter your email"
+							required
+						>
+						<button type="submit" class="btn btn-primary">
+							Resend Email
+						</button>
+					</div>
+				</form>
+
+				<div class="text-center mt-4">
+					<a href="<?= route_path('login') ?>" class="small">Return to Login</a>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/specs/authentication-implementation-plan.md b/specs/authentication-implementation-plan.md
index 9221c10..a50c225 100644
--- a/specs/authentication-implementation-plan.md
+++ b/specs/authentication-implementation-plan.md
@@ -617,7 +617,7 @@ cms/src/Cms/Auth/Filters/ApiKeyFilter.php
 **Configure Tiered Rate Limits**
 
 ```yaml
-# config/config.yaml
+# config/neuron.yaml
 api_limit_free:
   enabled: true
   storage: redis
@@ -944,7 +944,7 @@ cms/
 │               └── show.php
 ├── config/
 │   ├── auth.yaml       (new - auth configuration)
-│   └── config.yaml     (existing - add auth settings)
+│   └── neuron.yaml     (existing - add auth settings)
 ├── storage/
 │   └── users/
 │       └── users.json  (file-based user storage)
@@ -1166,7 +1166,7 @@ auth:
 
 ### Rate Limiting Configuration
 
-**File**: `config/config.yaml` (add to existing)
+**File**: `config/neuron.yaml` (add to existing)
 
 ```yaml
 # API Rate Limiting by Tier
@@ -1574,8 +1574,8 @@ php neuron user:create admin --role=admin
 
 **Step 5: Update Configuration**
 ```bash
-# Add auth configuration to config/config.yaml
-cat >> config/config.yaml << 'EOF'
+# Add auth configuration to config/neuron.yaml
+cat >> config/neuron.yaml << 'EOF'
 
 # Authentication
 auth:
diff --git a/src/Cms/Auth/EmailVerificationManager.php b/src/Cms/Auth/EmailVerificationManager.php
new file mode 100644
index 0000000..4c7f776
--- /dev/null
+++ b/src/Cms/Auth/EmailVerificationManager.php
@@ -0,0 +1,247 @@
+<?php
+
+namespace Neuron\Cms\Auth;
+
+use Neuron\Cms\Models\EmailVerificationToken;
+use Neuron\Cms\Models\User;
+use Neuron\Cms\Repositories\IEmailVerificationTokenRepository;
+use Neuron\Cms\Repositories\IUserRepository;
+use Neuron\Cms\Services\Email\Sender;
+use Neuron\Data\Setting\SettingManager;
+use Neuron\Log\Log;
+use Exception;
+
+/**
+ * Email verification manager.
+ *
+ * Handles email verification token generation, validation, and account activation.
+ *
+ * @package Neuron\Cms\Auth
+ */
+class EmailVerificationManager
+{
+	private IEmailVerificationTokenRepository $_tokenRepository;
+	private IUserRepository $_userRepository;
+	private SettingManager $_settings;
+	private string $_basePath;
+	private string $_verificationUrl;
+	private int $_tokenExpirationMinutes = 60;
+
+	/**
+	 * Constructor
+	 *
+	 * @param IEmailVerificationTokenRepository $tokenRepository Token repository
+	 * @param IUserRepository $userRepository User repository
+	 * @param SettingManager $settings Settings manager with email configuration
+	 * @param string $basePath Base path for template loading
+	 * @param string $verificationUrl Base URL for email verification (token will be appended)
+	 */
+	public function __construct(
+		IEmailVerificationTokenRepository $tokenRepository,
+		IUserRepository $userRepository,
+		SettingManager $settings,
+		string $basePath,
+		string $verificationUrl
+	)
+	{
+		$this->_tokenRepository = $tokenRepository;
+		$this->_userRepository = $userRepository;
+		$this->_settings = $settings;
+		$this->_basePath = $basePath;
+		$this->_verificationUrl = $verificationUrl;
+	}
+
+	/**
+	 * Set token expiration time in minutes
+	 */
+	public function setTokenExpirationMinutes( int $minutes ): self
+	{
+		$this->_tokenExpirationMinutes = $minutes;
+		return $this;
+	}
+
+	/**
+	 * Send verification email to a user
+	 *
+	 * Generates a secure token, stores it, and sends an email to the user.
+	 *
+	 * @param User $user User to send verification email to
+	 * @return bool True if verification email was sent
+	 * @throws Exception if email sending fails
+	 */
+	public function sendVerificationEmail( User $user ): bool
+	{
+		// Delete any existing tokens for this user
+		$this->_tokenRepository->deleteByUserId( $user->getId() );
+
+		// Generate secure random token
+		$plainToken = bin2hex( random_bytes( 32 ) );
+		$hashedToken = hash( 'sha256', $plainToken );
+
+		// Create and store token
+		$token = new EmailVerificationToken(
+			$user->getId(),
+			$hashedToken,
+			$this->_tokenExpirationMinutes
+		);
+
+		$this->_tokenRepository->create( $token );
+
+		// Send verification email
+		$this->sendEmail( $user, $plainToken );
+
+		return true;
+	}
+
+	/**
+	 * Validate a verification token
+	 *
+	 * @param string $plainToken Plain text token from URL
+	 * @return EmailVerificationToken|null Token if valid and not expired, null otherwise
+	 */
+	public function validateToken( string $plainToken ): ?EmailVerificationToken
+	{
+		$hashedToken = hash( 'sha256', $plainToken );
+
+		$token = $this->_tokenRepository->findByToken( $hashedToken );
+
+		if( !$token || $token->isExpired() )
+		{
+			return null;
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Verify email and activate user account
+	 *
+	 * @param string $plainToken Plain text token from URL
+	 * @return bool True if email was verified, false if token invalid or expired
+	 * @throws Exception if user update fails
+	 */
+	public function verifyEmail( string $plainToken ): bool
+	{
+		// Validate token
+		$token = $this->validateToken( $plainToken );
+
+		if( !$token )
+		{
+			return false;
+		}
+
+		// Find user
+		$user = $this->_userRepository->findById( $token->getUserId() );
+
+		if( !$user )
+		{
+			return false;
+		}
+
+		// Check if already verified
+		if( $user->isEmailVerified() )
+		{
+			// Delete the token even if already verified
+			$this->_tokenRepository->deleteByToken( hash( 'sha256', $plainToken ) );
+			return true;
+		}
+
+		// Update user email verification status
+		$user->setEmailVerified( true );
+
+		if( $user->getStatus() === User::STATUS_INACTIVE )
+		{
+			$user->setStatus( User::STATUS_ACTIVE );
+		}
+		$this->_userRepository->update( $user );
+
+		// Delete the token
+		$this->_tokenRepository->deleteByToken( hash( 'sha256', $plainToken ) );
+
+		Log::info( "Email verified for user: {$user->getUsername()}" );
+
+		return true;
+	}
+
+	/**
+	 * Resend verification email to a user by email address
+	 *
+	 * @param string $email User's email address
+	 * @return bool True if email was sent, false if user not found or already verified
+	 * @throws Exception if email sending fails
+	 */
+	public function resendVerification( string $email ): bool
+	{
+		$user = $this->_userRepository->findByEmail( $email );
+
+		if( !$user )
+		{
+			// Don't reveal whether email exists in system
+			return true;
+		}
+
+		// Don't send if already verified
+		if( $user->isEmailVerified() )
+		{
+			return false;
+		}
+
+		return $this->sendVerificationEmail( $user );
+	}
+
+	/**
+	 * Clean up expired tokens
+	 *
+	 * @return int Number of tokens deleted
+	 */
+	public function cleanupExpiredTokens(): int
+	{
+		return $this->_tokenRepository->deleteExpired();
+	}
+
+	/**
+	 * Send verification email
+	 *
+	 * @param User $user User to send email to
+	 * @param string $plainToken Plain text token to include in URL
+	 * @throws Exception if email sending fails
+	 */
+	private function sendEmail( User $user, string $plainToken ): void
+	{
+		$verificationLink = $this->_verificationUrl . '?token=' . urlencode( $plainToken );
+
+		// Get site name from settings
+		$siteName = $this->_settings->get( 'site', 'name' ) ?? 'Neuron CMS';
+
+		// Prepare template data
+		$templateData = [
+			'VerificationLink' => $verificationLink,
+			'ExpirationMinutes' => $this->_tokenExpirationMinutes,
+			'SiteName' => $siteName,
+			'Username' => $user->getUsername()
+		];
+
+		try
+		{
+			// Send email using Sender service with template
+			$sender = new Sender( $this->_settings, $this->_basePath );
+			$result = $sender
+				->to( $user->getEmail() )
+				->subject( "Verify Your Email Address - {$siteName}" )
+				->template( 'emails/email-verification', $templateData )
+				->send();
+
+			if( !$result )
+			{
+				throw new Exception( 'Failed to send verification email' );
+			}
+
+			Log::info( "Verification email sent to: {$user->getEmail()}" );
+		}
+		catch( \Exception $e )
+		{
+			Log::error( "Error sending verification email to {$user->getEmail()}: " . $e->getMessage() );
+			throw new Exception( 'Failed to send verification email' );
+		}
+	}
+}
diff --git a/src/Cms/Auth/Filters/MemberAuthenticationFilter.php b/src/Cms/Auth/Filters/MemberAuthenticationFilter.php
new file mode 100644
index 0000000..8a2ecbb
--- /dev/null
+++ b/src/Cms/Auth/Filters/MemberAuthenticationFilter.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Neuron\Cms\Auth\Filters;
+
+use Neuron\Routing\Filter;
+use Neuron\Routing\RouteMap;
+use Neuron\Cms\Auth\AuthManager;
+use Neuron\Patterns\Registry;
+
+/**
+ * Member authentication filter.
+ *
+ * Ensures user is authenticated and has member-level access (not admin-only).
+ * Also checks for email verification if required.
+ * Redirects to login page if not authenticated or to verification page if not verified.
+ *
+ * @package Neuron\Cms\Auth\Filters
+ */
+class MemberAuthenticationFilter extends Filter
+{
+	private AuthManager $_authManager;
+	private string $_loginUrl = '/login';
+	private string $_verifyEmailUrl = '/verify-email-required';
+	private string $_redirectParam = 'redirect';
+	private bool $_requireEmailVerification = true;
+
+	public function __construct(
+		AuthManager $authManager,
+		string $loginUrl = '/login',
+		bool $requireEmailVerification = true
+	)
+	{
+		$this->_authManager = $authManager;
+		$this->_loginUrl = $loginUrl;
+		$this->_requireEmailVerification = $requireEmailVerification;
+
+		parent::__construct(
+			function( RouteMap $route ) { $this->checkAuthentication( $route ); },
+			null
+		);
+	}
+
+	/**
+	 * Check if user is authenticated and verified
+	 */
+	protected function checkAuthentication( RouteMap $route ): void
+	{
+		$user = $this->_authManager->user();
+
+		// Check if user is authenticated
+		if( !$user )
+		{
+			// Store intended URL for post-login redirect
+			$intendedUrl = $_SERVER['REQUEST_URI'] ?? $route->getPath();
+
+			// Redirect to login page
+			$separator = ( strpos( $this->_loginUrl, '?' ) === false ) ? '?' : '&';
+			$query = http_build_query( [ $this->_redirectParam => $intendedUrl ] );
+			$redirectUrl = $this->_loginUrl . $separator . $query;
+
+			header( 'Location: ' . $redirectUrl );
+			exit;
+		}
+
+		// Check if email verification is required
+		if( $this->_requireEmailVerification && !$user->isEmailVerified() )
+		{
+			// Redirect to email verification required page
+			header( 'Location: ' . $this->_verifyEmailUrl );
+			exit;
+		}
+
+		// Set user in Registry for controllers to access
+		Registry::getInstance()->set( 'Auth.User', $user );
+		Registry::getInstance()->set( 'Auth.UserId', $user->getId() );
+		Registry::getInstance()->set( 'Auth.UserRole', $user->getRole() );
+	}
+
+	/**
+	 * Set login URL
+	 */
+	public function setLoginUrl( string $loginUrl ): self
+	{
+		$this->_loginUrl = $loginUrl;
+		return $this;
+	}
+
+	/**
+	 * Set verify email URL
+	 */
+	public function setVerifyEmailUrl( string $verifyEmailUrl ): self
+	{
+		$this->_verifyEmailUrl = $verifyEmailUrl;
+		return $this;
+	}
+
+	/**
+	 * Set whether email verification is required
+	 */
+	public function setRequireEmailVerification( bool $require ): self
+	{
+		$this->_requireEmailVerification = $require;
+		return $this;
+	}
+}
diff --git a/src/Cms/Cli/Commands/Install/InstallCommand.php b/src/Cms/Cli/Commands/Install/InstallCommand.php
index a0a6f90..f8e6d81 100644
--- a/src/Cms/Cli/Commands/Install/InstallCommand.php
+++ b/src/Cms/Cli/Commands/Install/InstallCommand.php
@@ -87,6 +87,7 @@ public function execute( array $parameters = [] ): int
 			'createAuthConfig' => 'Creating auth configuration...',
 			'createPublicFiles' => 'Creating public folder and copying static assets...',
 			'setupDatabase' => 'Setting up database...',
+			'copyMigrations' => 'Copying database migrations...',
 		];
 
 		foreach( $steps as $method => $message )
@@ -100,13 +101,6 @@ public function execute( array $parameters = [] ): int
 			}
 		}
 
-		// Generate migration
-		if( !$this->generateMigration() )
-		{
-			$this->output->error( "Installation failed at migration generation!" );
-			return 1;
-		}
-
 		// Ask to run migration
 		$this->output->writeln( "" );
 		if( $this->input->confirm( "Would you like to run the migration now?", true ) )
@@ -170,6 +164,9 @@ private function createDirectories(): bool
 			'/resources/views/emails',
 			'/resources/views/http_codes',
 			'/resources/views/layouts',
+			'/resources/views/member',
+			'/resources/views/member/dashboard',
+			'/resources/views/member/profile',
 
 			// Application directories
 			'/app/Controllers',
@@ -220,7 +217,7 @@ private function createDirectories(): bool
 	private function publishViews(): bool
 	{
 		// Copy all view directories
-		$viewDirs = [ 'admin', 'auth', 'blog', 'content', 'emails', 'home', 'http_codes', 'layouts' ];
+		$viewDirs = [ 'admin', 'auth', 'blog', 'content', 'emails', 'home', 'http_codes', 'layouts', 'member' ];
 
 		foreach( $viewDirs as $dir )
 		{
@@ -688,7 +685,7 @@ private function configurePostgresql(): array
 	 */
 	private function saveConfig( array $config ): bool
 	{
-		$configFile = $this->_projectPath . '/config/config.yaml';
+		$configFile = $this->_projectPath . '/config/neuron.yaml';
 
 		// If config exists, merge with existing
 		$existingConfig = [];
@@ -731,7 +728,7 @@ private function saveConfig( array $config ): bool
 			return false;
 		}
 
-		$this->_messages[] = "Created: config/config.yaml";
+		$this->_messages[] = "Created: config/neuron.yaml";
 		return true;
 	}
 
@@ -783,17 +780,12 @@ private function yamlValue( $value ): string
 	}
 
 	/**
-	 * Generate database migration
+	 * Copy database migrations from component to project
 	 */
-	private function generateMigration(): bool
+	private function copyMigrations(): bool
 	{
-		$this->output->writeln( "\nGenerating database migration..." );
-
-		$migrationName = 'CreateUsersTable';
-		$snakeCaseName = $this->camelToSnake( $migrationName );
-
-		// Use db/migrate path to match MigrationManager expectations
 		$migrationsDir = $this->_projectPath . '/db/migrate';
+		$componentMigrationsDir = $this->_componentPath . '/resources/database/migrate';
 
 		// Create migrations directory if it doesn't exist
 		if( !is_dir( $migrationsDir ) )
@@ -805,99 +797,46 @@ private function generateMigration(): bool
 			}
 		}
 
-		// Check if migration already exists
-		$existingFiles = glob( $migrationsDir . '/*_' . $snakeCaseName . '.php' );
-		if( !empty( $existingFiles ) )
+		// Check if component migrations directory exists
+		if( !is_dir( $componentMigrationsDir ) )
 		{
-			$existingFile = basename( $existingFiles[0] );
-			$this->output->info( "Migration already exists: $existingFile" );
-			$this->_messages[] = "Using existing migration: db/migrate/$existingFile";
-			return true;
+			$this->output->error( "Component migrations directory not found at: $componentMigrationsDir" );
+			return false;
 		}
 
-		$timestamp = date( 'YmdHis' );
-		$className = $migrationName;
-		$fileName = $timestamp . '_' . $snakeCaseName . '.php';
-		$filePath = $migrationsDir . '/' . $fileName;
-
-		$template = $this->getMigrationTemplate( $className );
+		// Copy all migration files
+		$files = glob( $componentMigrationsDir . '/*.php' );
 
-		if( file_put_contents( $filePath, $template ) === false )
+		if( empty( $files ) )
 		{
-			$this->output->error( "Failed to create migration file!" );
-			return false;
+			$this->output->warning( "No migration files found in component" );
+			return true;
 		}
 
-		$this->_messages[] = "Created: db/migrate/$fileName";
-		return true;
-	}
-
-	/**
-	 * Get migration template with users and password_reset_tokens table schema
-	 */
-	private function getMigrationTemplate( string $className ): string
-	{
-		return <<<PHP
-<?php
-
-use Phinx\Migration\AbstractMigration;
+		foreach( $files as $sourceFile )
+		{
+			$fileName = basename( $sourceFile );
+			$destFile = $migrationsDir . '/' . $fileName;
 
-/**
- * Create users and password_reset_tokens tables
- */
-class $className extends AbstractMigration
-{
-	/**
-	 * Create users and password_reset_tokens tables
-	 */
-	public function change()
-	{
-		// Create users table
-		\$usersTable = \$this->table( 'users' );
-
-		\$usersTable->addColumn( 'username', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'email', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'password_hash', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'role', 'string', [ 'limit' => 50, 'default' => 'subscriber' ] )
-			->addColumn( 'status', 'string', [ 'limit' => 50, 'default' => 'active' ] )
-			->addColumn( 'email_verified', 'boolean', [ 'default' => false ] )
-			->addColumn( 'two_factor_secret', 'string', [ 'limit' => 255, 'null' => true ] )
-			->addColumn( 'remember_token', 'string', [ 'limit' => 255, 'null' => true ] )
-			->addColumn( 'failed_login_attempts', 'integer', [ 'default' => 0 ] )
-			->addColumn( 'locked_until', 'timestamp', [ 'null' => true ] )
-			->addColumn( 'last_login_at', 'timestamp', [ 'null' => true ] )
-			->addColumn( 'timezone', 'string', [ 'limit' => 50, 'default' => 'UTC' ] )
-			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
-			->addColumn( 'updated_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP', 'update' => 'CURRENT_TIMESTAMP' ] )
-			->addIndex( [ 'username' ], [ 'unique' => true ] )
-			->addIndex( [ 'email' ], [ 'unique' => true ] )
-			->addIndex( [ 'remember_token' ] )
-			->addIndex( [ 'status' ] )
-			->create();
-
-		// Create password_reset_tokens table
-		\$tokensTable = \$this->table( 'password_reset_tokens' );
-
-		\$tokensTable->addColumn( 'email', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'token', 'string', [ 'limit' => 64 ] )
-			->addColumn( 'created_at', 'timestamp', [ 'default' => 'CURRENT_TIMESTAMP' ] )
-			->addColumn( 'expires_at', 'timestamp', [ 'null' => false ] )
-			->addIndex( [ 'email' ] )
-			->addIndex( [ 'token' ] )
-			->addIndex( [ 'expires_at' ] )
-			->create();
-	}
-}
+			// Skip if file already exists
+			if( file_exists( $destFile ) )
+			{
+				$this->_messages[] = "Migration already exists: db/migrate/$fileName";
+				continue;
+			}
 
-PHP;
-	}
+			if( copy( $sourceFile, $destFile ) )
+			{
+				$this->_messages[] = "Copied migration: db/migrate/$fileName";
+			}
+			else
+			{
+				$this->output->error( "Failed to copy migration: $fileName" );
+				return false;
+			}
+		}
 
-	/**
-	 * Convert CamelCase to snake_case
-	 */
-	private function camelToSnake( string $input ): string
-	{
-		return strtolower( preg_replace( '/(?<!^)[A-Z]/', '_$0', $input ) );
+		return true;
 	}
 
 	/**
diff --git a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
index 283dedb..58d3564 100644
--- a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
+++ b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
@@ -168,7 +168,7 @@ private function parseAllowedIps( ?string $ipOption, ?MaintenanceConfig $config
 	 */
 	private function loadConfiguration( string $configPath ): ?MaintenanceConfig
 	{
-		$configFile = $configPath . '/config.yaml';
+		$configFile = $configPath . '/neuron.yaml';
 
 		if( !file_exists( $configFile ) )
 		{
diff --git a/src/Cms/Cli/Commands/Queue/InstallCommand.php b/src/Cms/Cli/Commands/Queue/InstallCommand.php
index 610583e..e6c70ab 100644
--- a/src/Cms/Cli/Commands/Queue/InstallCommand.php
+++ b/src/Cms/Cli/Commands/Queue/InstallCommand.php
@@ -93,12 +93,12 @@ public function execute( array $parameters = [] ): int
 
 		if( $this->addQueueConfig() )
 		{
-			$this->output->success( "Queue configuration added to config.yaml" );
+			$this->output->success( "Queue configuration added to neuron.yaml" );
 		}
 		else
 		{
 			$this->output->warning( "Could not add queue configuration automatically" );
-			$this->output->info( "Please add the following to config/config.yaml:" );
+			$this->output->info( "Please add the following to config/neuron.yaml:" );
 			$this->output->write( "\n" );
 			$this->output->write( "queue:\n" );
 			$this->output->write( "  driver: database\n" );
@@ -167,7 +167,7 @@ private function isAlreadyInstalled(): bool
 		}
 
 		// Check for queue config
-		$configFile = $this->_projectPath . '/config/config.yaml';
+		$configFile = $this->_projectPath . '/config/neuron.yaml';
 
 		if( !file_exists( $configFile ) )
 		{
@@ -288,11 +288,11 @@ public function change()
 	}
 
 	/**
-	 * Add queue configuration to config.yaml
+	 * Add queue configuration to neuron.yaml
 	 */
 	private function addQueueConfig(): bool
 	{
-		$configFile = $this->_projectPath . '/config/config.yaml';
+		$configFile = $this->_projectPath . '/config/neuron.yaml';
 
 		if( !file_exists( $configFile ) )
 		{
diff --git a/src/Cms/Controllers/Home.php b/src/Cms/Controllers/Home.php
index 5481748..ff81f00 100644
--- a/src/Cms/Controllers/Home.php
+++ b/src/Cms/Controllers/Home.php
@@ -25,12 +25,22 @@ class Home extends Content
 	 */
 	public function index( array $parameters, ?Request $request ): string
 	{
+		// Check if registration is enabled
+		$registrationEnabled = false;
+		$registrationService = \Neuron\Patterns\Registry::getInstance()->get( 'RegistrationService' );
+
+		if( $registrationService && method_exists( $registrationService, 'isRegistrationEnabled' ) )
+		{
+			$registrationEnabled = $registrationService->isRegistrationEnabled();
+		}
+
 		return $this->renderHtml(
 			HttpResponseStatus::OK,
 			[
 				'Title' => $this->getTitle(),
 				'Name' => $this->getName(),
 				'Description' => $this->getDescription(),
+				'RegistrationEnabled' => $registrationEnabled,
 			],
 			'index'
 		);
diff --git a/src/Cms/Controllers/Member/Dashboard.php b/src/Cms/Controllers/Member/Dashboard.php
new file mode 100644
index 0000000..f918277
--- /dev/null
+++ b/src/Cms/Controllers/Member/Dashboard.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Neuron\Cms\Controllers\Member;
+
+use Neuron\Cms\Controllers\Content;
+use Neuron\Cms\Auth\CsrfTokenManager;
+use Neuron\Mvc\Application;
+use Neuron\Mvc\Responses\HttpResponseStatus;
+use Neuron\Patterns\Registry;
+
+/**
+ * Member dashboard controller.
+ *
+ * @package Neuron\Cms\Controllers\Member
+ */
+class Dashboard extends Content
+{
+	/**
+	 * @param Application|null $app
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function __construct( ?Application $app = null )
+	{
+		parent::__construct( $app );
+	}
+
+	/**
+	 * Show member dashboard
+	 * @param array $parameters
+	 * @return string
+	 */
+	public function index( array $parameters ): string
+	{
+		// Get authenticated user from Registry
+		$user = Registry::getInstance()->get( 'Auth.User' );
+
+		if( !$user )
+		{
+			throw new \RuntimeException( 'Authenticated user not found in Registry' );
+		}
+
+		// Generate CSRF token and store in Registry
+		$csrfManager = new CsrfTokenManager( $this->getSessionManager() );
+		Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() );
+
+		$viewData = [
+			'Title' => 'Member Dashboard | ' . $this->getName(),
+			'Description' => 'Member Dashboard',
+			'User' => $user,
+			'WelcomeMessage' => 'Welcome, ' . $user->getUsername() . '!'
+		];
+
+		return $this->renderHtml(
+			HttpResponseStatus::OK,
+			$viewData,
+			'index',
+			'member/dashboard'
+		);
+	}
+}
diff --git a/src/Cms/Controllers/Member/Profile.php b/src/Cms/Controllers/Member/Profile.php
new file mode 100644
index 0000000..775307c
--- /dev/null
+++ b/src/Cms/Controllers/Member/Profile.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Neuron\Cms\Controllers\Member;
+
+use Neuron\Cms\Controllers\Content;
+use Neuron\Cms\Repositories\DatabaseUserRepository;
+use Neuron\Cms\Services\User\Updater;
+use Neuron\Cms\Auth\PasswordHasher;
+use Neuron\Cms\Auth\CsrfTokenManager;
+use Neuron\Mvc\Application;
+use Neuron\Mvc\Responses\HttpResponseStatus;
+use Neuron\Patterns\Registry;
+
+/**
+ * Member profile management controller.
+ *
+ * @package Neuron\Cms\Controllers\Member
+ */
+class Profile extends Content
+{
+	private DatabaseUserRepository $_repository;
+	private PasswordHasher $_hasher;
+	private Updater $_userUpdater;
+
+	/**
+	 * @param Application|null $app
+	 * @throws \Exception
+	 */
+	public function __construct( ?Application $app = null )
+	{
+		parent::__construct( $app );
+
+		// Get settings and initialize repository
+		$settings = Registry::getInstance()->get( 'Settings' );
+		$this->_repository = new DatabaseUserRepository( $settings );
+		$this->_hasher = new PasswordHasher();
+
+		// Initialize service
+		$this->_userUpdater = new Updater( $this->_repository, $this->_hasher );
+	}
+
+	/**
+	 * Show profile edit form
+	 * @param array $parameters
+	 * @return string
+	 * @throws \Exception
+	 */
+	public function edit( array $parameters ): string
+	{
+		$user = Registry::getInstance()->get( 'Auth.User' );
+
+		if( !$user )
+		{
+			throw new \RuntimeException( 'Authenticated user not found' );
+		}
+
+		// Generate CSRF token
+		$csrfManager = new CsrfTokenManager( $this->getSessionManager() );
+		Registry::getInstance()->set( 'Auth.CsrfToken', $csrfManager->getToken() );
+
+		// Get available timezones grouped by region
+		$timezones = \DateTimeZone::listIdentifiers();
+
+		$viewData = [
+			'Title' => 'Profile | ' . $this->getName(),
+			'Description' => 'Edit Your Profile',
+			'User' => $user,
+			'timezones' => $timezones,
+			'success' => $this->getSessionManager()->getFlash( 'success' ),
+			'error' => $this->getSessionManager()->getFlash( 'error' )
+		];
+
+		return $this->renderHtml(
+			HttpResponseStatus::OK,
+			$viewData,
+			'edit',
+			'member/profile'
+		);
+	}
+
+	/**
+	 * Update profile
+	 * @param array $parameters
+	 * @return never
+	 * @throws \Exception
+	 */
+	public function update( array $parameters ): never
+	{
+		$user = Registry::getInstance()->get( 'Auth.User' );
+
+		if( !$user )
+		{
+			throw new \RuntimeException( 'Authenticated user not found' );
+		}
+
+		$email = $_POST['email'] ?? '';
+		$timezone = $_POST['timezone'] ?? '';
+		$currentPassword = $_POST['current_password'] ?? '';
+		$newPassword = $_POST['new_password'] ?? '';
+		$confirmPassword = $_POST['confirm_password'] ?? '';
+
+		// Validate password change if requested
+		if( !empty( $newPassword ) )
+		{
+			// Verify current password
+			if( empty( $currentPassword ) || !$this->_hasher->verify( $currentPassword, $user->getPasswordHash() ) )
+			{
+				$this->redirect( 'member_profile', [], ['error', 'Current password is incorrect'] );
+			}
+
+			// Validate new password matches confirmation
+			if( $newPassword !== $confirmPassword )
+			{
+				$this->redirect( 'member_profile', [], ['error', 'New passwords do not match'] );
+			}
+		}
+
+		try
+		{
+			$this->_userUpdater->update(
+				$user,
+				$user->getUsername(),
+				$email,
+				$user->getRole(),
+				!empty( $newPassword ) ? $newPassword : null,
+				!empty( $timezone ) ? $timezone : null
+			);
+			$this->redirect( 'member_profile', [], ['success', 'Profile updated successfully'] );
+		}
+		catch( \Exception $e )
+		{
+			$this->redirect( 'member_profile', [], ['error', $e->getMessage()] );
+		}
+	}
+}
diff --git a/src/Cms/Controllers/Member/Registration.php b/src/Cms/Controllers/Member/Registration.php
new file mode 100644
index 0000000..632c83a
--- /dev/null
+++ b/src/Cms/Controllers/Member/Registration.php
@@ -0,0 +1,312 @@
+<?php
+
+namespace Neuron\Cms\Controllers\Member;
+
+use Neuron\Cms\Controllers\Content;
+use Neuron\Cms\Auth\CsrfTokenManager;
+use Neuron\Cms\Auth\EmailVerificationManager;
+use Neuron\Cms\Auth\ResendVerificationThrottle;
+use Neuron\Cms\Services\Member\RegistrationService;
+use Neuron\Data\Filter\Get;
+use Neuron\Data\Filter\Post;
+use Neuron\Mvc\Application;
+use Neuron\Mvc\Responses\HttpResponseStatus;
+use Neuron\Patterns\Registry;
+use Neuron\Routing\DefaultIpResolver;
+use Neuron\Routing\IIpResolver;
+use Exception;
+
+/**
+ * Member registration controller.
+ *
+ * Handles user registration and email verification.
+ *
+ * @package Neuron\Cms\Controllers\Member
+ */
+class Registration extends Content
+{
+	private RegistrationService $_registrationService;
+	private EmailVerificationManager $_verificationManager;
+	private CsrfTokenManager $_csrfManager;
+	private ResendVerificationThrottle $_resendThrottle;
+	private IIpResolver $_ipResolver;
+
+	/**
+	 * @param Application|null $app
+	 * @throws \Exception
+	 */
+	public function __construct( ?Application $app = null )
+	{
+		parent::__construct( $app );
+
+		// Get services from Registry
+		$this->_registrationService = Registry::getInstance()->get( 'RegistrationService' );
+		$this->_verificationManager = Registry::getInstance()->get( 'EmailVerificationManager' );
+
+		if( !$this->_registrationService || !$this->_verificationManager )
+		{
+			throw new \RuntimeException( 'Registration services not found in Registry.' );
+		}
+
+		// Initialize CSRF manager
+		$this->_csrfManager = new CsrfTokenManager( $this->getSessionManager() );
+
+		// Initialize resend verification throttle
+		$this->_resendThrottle = new ResendVerificationThrottle();
+
+		// Initialize IP resolver
+		$this->_ipResolver = new DefaultIpResolver();
+	}
+
+	/**
+	 * Show registration form
+	 * @param array $parameters
+	 * @return string
+	 */
+	public function showRegistrationForm( array $parameters ): string
+	{
+		// Check if registration is enabled
+		if( !$this->_registrationService->isRegistrationEnabled() )
+		{
+			$viewData = [
+				'Title' => 'Registration Disabled | ' . $this->getName(),
+				'Description' => 'User registration is currently disabled'
+			];
+
+			return $this->renderHtml(
+				HttpResponseStatus::OK,
+				$viewData,
+				'registration-disabled',
+				'member'
+			);
+		}
+
+		// Set CSRF token in Registry
+		Registry::getInstance()->set( 'Auth.CsrfToken', $this->_csrfManager->getToken() );
+
+		$viewData = [
+			'Title' => 'Register | ' . $this->getName(),
+			'Description' => 'Create your account',
+			'Error' => $this->getSessionManager()->getFlash( 'error' ),
+			'Success' => $this->getSessionManager()->getFlash( 'success' )
+		];
+
+		return $this->renderHtml(
+			HttpResponseStatus::OK,
+			$viewData,
+			'register',
+			'member'
+		);
+	}
+
+	/**
+	 * Process registration
+	 * @param array $parameters
+	 * @return never
+	 */
+	public function processRegistration( array $parameters ): never
+	{
+		$post = new Post();
+
+		// Validate CSRF token
+		$token = $post->filterScalar( 'csrf_token' );
+
+		if( !$this->_csrfManager->validate( $token ) )
+		{
+			$this->redirect( 'register', [], ['error', 'Invalid CSRF token. Please try again.'] );
+		}
+
+		// Get form data
+		$username = $post->filterScalar( 'username' ) ?? '';
+		$email = $post->filterScalar( 'email' ) ?? '';
+		$password = $post->filterScalar( 'password' ) ?? '';
+		$passwordConfirmation = $post->filterScalar( 'password_confirmation' ) ?? '';
+
+		try
+		{
+			// Register user
+			$user = $this->_registrationService->register(
+				$username,
+				$email,
+				$password,
+				$passwordConfirmation
+			);
+
+			// Check if verification is required
+			$settings = Registry::getInstance()->get( 'Settings' );
+			$requireVerification = $settings->get( 'member', 'require_email_verification' ) ?? true;
+
+			if( $requireVerification )
+			{
+				// Redirect to verification sent page
+				$this->redirect( 'verify_email_sent', [], ['success', 'Registration successful! Please check your email to verify your account.'] );
+			}
+			else
+			{
+				// Redirect to login
+				$this->redirect( 'login', [], ['success', 'Registration successful! You can now log in.'] );
+			}
+		}
+		catch( Exception $e )
+		{
+			// Redirect back with error
+			$this->redirect( 'register', [], ['error', $e->getMessage()] );
+		}
+	}
+
+	/**
+	 * Show verification email sent page
+	 * @param array $parameters
+	 * @return string
+	 */
+	public function showVerificationSent( array $parameters ): string
+	{
+		$viewData = [
+			'Title' => 'Verify Your Email | ' . $this->getName(),
+			'Description' => 'Please check your email',
+			'Success' => $this->getSessionManager()->getFlash( 'success' )
+		];
+
+		return $this->renderHtml(
+			HttpResponseStatus::OK,
+			$viewData,
+			'verify-email-sent',
+			'member'
+		);
+	}
+
+	/**
+	 * Verify email address
+	 * @param array $parameters
+	 * @return string
+	 */
+	public function verify( array $parameters ): string
+	{
+		$get = new Get();
+
+		// Get token from query string
+		$token = $get->filterScalar( 'token' ) ?? '';
+
+		if( empty( $token ) )
+		{
+			$viewData = [
+				'Title' => 'Email Verification | ' . $this->getName(),
+				'Description' => 'Email verification',
+				'Success' => false,
+				'Message' => 'Invalid or missing verification token.'
+			];
+
+			return $this->renderHtml(
+				HttpResponseStatus::BAD_REQUEST,
+				$viewData,
+				'email-verified',
+				'member'
+			);
+		}
+
+		try
+		{
+			// Verify the token
+			$success = $this->_verificationManager->verifyEmail( $token );
+
+			if( $success )
+			{
+				$viewData = [
+					'Title' => 'Email Verified | ' . $this->getName(),
+					'Description' => 'Your email has been verified',
+					'Success' => true,
+					'Message' => 'Your email has been verified successfully! You can now log in.'
+				];
+
+				return $this->renderHtml(
+					HttpResponseStatus::OK,
+					$viewData,
+					'email-verified',
+					'member'
+				);
+			}
+			else
+			{
+				$viewData = [
+					'Title' => 'Email Verification | ' . $this->getName(),
+					'Description' => 'Email verification failed',
+					'Success' => false,
+					'Message' => 'This verification link is invalid or has expired.'
+				];
+
+				return $this->renderHtml(
+					HttpResponseStatus::BAD_REQUEST,
+					$viewData,
+					'email-verified',
+					'member'
+				);
+			}
+		}
+		catch( Exception $e )
+		{
+			$viewData = [
+				'Title' => 'Email Verification | ' . $this->getName(),
+				'Description' => 'Email verification error',
+				'Success' => false,
+				'Message' => 'An error occurred during email verification. Please try again later.'
+			];
+
+			return $this->renderHtml(
+				HttpResponseStatus::INTERNAL_SERVER_ERROR,
+				$viewData,
+				'email-verified',
+				'member'
+			);
+		}
+	}
+
+	/**
+	 * Resend verification email
+	 * @param array $parameters
+	 * @return never
+	 */
+	public function resendVerification( array $parameters ): never
+	{
+		$post = new Post();
+
+		// Validate CSRF token
+		$token = $post->filterScalar( 'csrf_token' );
+
+		if( !$this->_csrfManager->validate( $token ) )
+		{
+			$this->redirect( 'register', [], ['error', 'Invalid CSRF token. Please try again.'] );
+		}
+
+		// Get email and client IP
+		$email = $post->filterScalar( 'email' ) ?? '';
+		$clientIp = $this->_ipResolver->resolve( $_SERVER );
+
+		if( empty( $email ) )
+		{
+			$this->redirect( 'register', [], ['error', 'Email address is required.'] );
+		}
+
+		// Check rate limits (combined IP and email throttling)
+		if( !$this->_resendThrottle->allow( $clientIp, $email ) )
+		{
+			// Rate limit exceeded - return generic success to prevent enumeration
+			// This prevents attackers from using rate limiting to determine if an email exists
+			$this->redirect( 'verify_email_sent', [], ['success', 'If an account exists with that email, a verification email has been sent.'] );
+		}
+
+		try
+		{
+			// Resend verification email
+			$this->_verificationManager->resendVerification( $email );
+
+			// Always show success message (don't reveal if email exists)
+			$this->redirect( 'verify_email_sent', [], ['success', 'If an account exists with that email, a verification email has been sent.'] );
+		}
+		catch( Exception $e )
+		{
+			// Don't reveal specific error details to prevent enumeration
+			// Log the error internally but show generic message to user
+			$this->redirect( 'verify_email_sent', [], ['success', 'If an account exists with that email, a verification email has been sent.'] );
+		}
+	}
+}
diff --git a/src/Cms/Dtos/RegisterUserDto.yaml b/src/Cms/Dtos/RegisterUserDto.yaml
new file mode 100644
index 0000000..3f2c592
--- /dev/null
+++ b/src/Cms/Dtos/RegisterUserDto.yaml
@@ -0,0 +1,28 @@
+properties:
+  username:
+    type: string
+    required: true
+    validators:
+      - IsNotEmpty
+      - IsStringLength:
+          min: 3
+          max: 50
+      - IsAlphanumeric
+  email:
+    type: string
+    required: true
+    validators:
+      - IsNotEmpty
+      - IsEmail
+  password:
+    type: string
+    required: true
+    validators:
+      - IsNotEmpty
+      - IsStringLength:
+          min: 8
+  password_confirmation:
+    type: string
+    required: true
+    validators:
+      - IsNotEmpty
diff --git a/src/Cms/Maintenance/README.md b/src/Cms/Maintenance/README.md
index 3f54907..d18eed8 100644
--- a/src/Cms/Maintenance/README.md
+++ b/src/Cms/Maintenance/README.md
@@ -55,7 +55,7 @@ neuron cms:maintenance:status --json
 
 ## Configuration
 
-Add maintenance mode settings to your `config/config.yaml`:
+Add maintenance mode settings to your `config/neuron.yaml`:
 
 ```yaml
 maintenance:
@@ -159,7 +159,7 @@ You can create a custom maintenance page template:
 </html>
 ```
 
-2. Configure it in `config.yaml`:
+2. Configure it in `neuron.yaml`:
 
 ```yaml
 maintenance:
diff --git a/src/Cms/Models/EmailVerificationToken.php b/src/Cms/Models/EmailVerificationToken.php
new file mode 100644
index 0000000..c53e552
--- /dev/null
+++ b/src/Cms/Models/EmailVerificationToken.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Neuron\Cms\Models;
+
+use DateTimeImmutable;
+
+/**
+ * Email verification token entity.
+ *
+ * Represents a token for email verification with expiration.
+ *
+ * @package Neuron\Cms\Models
+ */
+class EmailVerificationToken
+{
+	private ?int $_id = null;
+	private int $_userId;
+	private string $_token;
+	private DateTimeImmutable $_createdAt;
+	private DateTimeImmutable $_expiresAt;
+
+	/**
+	 * Create a new email verification token
+	 *
+	 * @param int $userId User's ID
+	 * @param string $token Hashed token
+	 * @param int $expirationMinutes Token expiration in minutes (default: 60)
+	 */
+	public function __construct( int $userId = 0, string $token = '', int $expirationMinutes = 60 )
+	{
+		$this->_userId = $userId;
+		$this->_token = $token;
+		$this->_createdAt = new DateTimeImmutable();
+		$this->_expiresAt = $this->_createdAt->modify( "+{$expirationMinutes} minutes" );
+	}
+
+	/**
+	 * Get token ID
+	 */
+	public function getId(): ?int
+	{
+		return $this->_id;
+	}
+
+	/**
+	 * Set token ID
+	 */
+	public function setId( int $id ): self
+	{
+		$this->_id = $id;
+		return $this;
+	}
+
+	/**
+	 * Get user ID
+	 */
+	public function getUserId(): int
+	{
+		return $this->_userId;
+	}
+
+	/**
+	 * Set user ID
+	 */
+	public function setUserId( int $userId ): self
+	{
+		$this->_userId = $userId;
+		return $this;
+	}
+
+	/**
+	 * Get token (hashed)
+	 */
+	public function getToken(): string
+	{
+		return $this->_token;
+	}
+
+	/**
+	 * Set token (should be hashed before setting)
+	 */
+	public function setToken( string $token ): self
+	{
+		$this->_token = $token;
+		return $this;
+	}
+
+	/**
+	 * Get created timestamp
+	 */
+	public function getCreatedAt(): DateTimeImmutable
+	{
+		return $this->_createdAt;
+	}
+
+	/**
+	 * Set created timestamp
+	 */
+	public function setCreatedAt( DateTimeImmutable $createdAt ): self
+	{
+		$this->_createdAt = $createdAt;
+		return $this;
+	}
+
+	/**
+	 * Get expiration timestamp
+	 */
+	public function getExpiresAt(): DateTimeImmutable
+	{
+		return $this->_expiresAt;
+	}
+
+	/**
+	 * Set expiration timestamp
+	 */
+	public function setExpiresAt( DateTimeImmutable $expiresAt ): self
+	{
+		$this->_expiresAt = $expiresAt;
+		return $this;
+	}
+
+	/**
+	 * Check if token has expired
+	 */
+	public function isExpired(): bool
+	{
+		return new DateTimeImmutable() > $this->_expiresAt;
+	}
+
+	/**
+	 * Create token from array data
+	 */
+	public static function fromArray( array $data ): self
+	{
+		$token = new self();
+
+		if( isset( $data['id'] ) )
+		{
+			$token->setId( (int) $data['id'] );
+		}
+
+		if( isset( $data['user_id'] ) )
+		{
+			$token->setUserId( (int) $data['user_id'] );
+		}
+
+		if( isset( $data['token'] ) )
+		{
+			$token->setToken( $data['token'] );
+		}
+
+		if( isset( $data['created_at'] ) )
+		{
+			$token->setCreatedAt( new DateTimeImmutable( $data['created_at'] ) );
+		}
+
+		if( isset( $data['expires_at'] ) )
+		{
+			$token->setExpiresAt( new DateTimeImmutable( $data['expires_at'] ) );
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Convert token to array
+	 */
+	public function toArray(): array
+	{
+		return [
+			'id' => $this->_id,
+			'user_id' => $this->_userId,
+			'token' => $this->_token,
+			'created_at' => $this->_createdAt->format( 'Y-m-d H:i:s' ),
+			'expires_at' => $this->_expiresAt->format( 'Y-m-d H:i:s' )
+		];
+	}
+}
diff --git a/src/Cms/Repositories/DatabaseEmailVerificationTokenRepository.php b/src/Cms/Repositories/DatabaseEmailVerificationTokenRepository.php
new file mode 100644
index 0000000..59cca22
--- /dev/null
+++ b/src/Cms/Repositories/DatabaseEmailVerificationTokenRepository.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Neuron\Cms\Repositories;
+
+use Neuron\Cms\Database\ConnectionFactory;
+use Neuron\Cms\Models\EmailVerificationToken;
+use Neuron\Data\Setting\SettingManager;
+use PDO;
+use Exception;
+use DateTimeImmutable;
+
+/**
+ * Database-backed email verification token repository.
+ *
+ * Works with SQLite, MySQL, and PostgreSQL via PDO.
+ *
+ * @package Neuron\Cms\Repositories
+ */
+class DatabaseEmailVerificationTokenRepository implements IEmailVerificationTokenRepository
+{
+	private PDO $_pdo;
+
+	/**
+	 * Constructor
+	 *
+	 * @param SettingManager $settings Settings manager with database configuration
+	 * @throws Exception if database configuration is missing or adapter is unsupported
+	 */
+	public function __construct( SettingManager $settings )
+	{
+		$this->_pdo = ConnectionFactory::createFromSettings( $settings );
+	}
+
+	/**
+	 * Create a new email verification token
+	 */
+	public function create( EmailVerificationToken $token ): EmailVerificationToken
+	{
+		$stmt = $this->_pdo->prepare(
+			"INSERT INTO email_verification_tokens (user_id, token, created_at, expires_at)
+			 VALUES (?, ?, ?, ?)"
+		);
+
+		$stmt->execute([
+			$token->getUserId(),
+			$token->getToken(),
+			$token->getCreatedAt()->format( 'Y-m-d H:i:s' ),
+			$token->getExpiresAt()->format( 'Y-m-d H:i:s' )
+		]);
+
+		$token->setId( (int) $this->_pdo->lastInsertId() );
+
+		return $token;
+	}
+
+	/**
+	 * Find a token by its hashed value
+	 */
+	public function findByToken( string $token ): ?EmailVerificationToken
+	{
+		$stmt = $this->_pdo->prepare( "SELECT * FROM email_verification_tokens WHERE token = ? LIMIT 1" );
+		$stmt->execute( [ $token ] );
+
+		$row = $stmt->fetch();
+
+		return $row ? $this->mapRowToToken( $row ) : null;
+	}
+
+	/**
+	 * Find most recent token by user ID
+	 */
+	public function findByUserId( int $userId ): ?EmailVerificationToken
+	{
+		$stmt = $this->_pdo->prepare(
+			"SELECT * FROM email_verification_tokens
+			 WHERE user_id = ?
+			 ORDER BY created_at DESC
+			 LIMIT 1"
+		);
+		$stmt->execute( [ $userId ] );
+
+		$row = $stmt->fetch();
+
+		return $row ? $this->mapRowToToken( $row ) : null;
+	}
+
+	/**
+	 * Delete all tokens for a given user ID
+	 */
+	public function deleteByUserId( int $userId ): int
+	{
+		$stmt = $this->_pdo->prepare( "DELETE FROM email_verification_tokens WHERE user_id = ?" );
+		$stmt->execute( [ $userId ] );
+
+		return $stmt->rowCount();
+	}
+
+	/**
+	 * Delete a specific token by its hashed value
+	 */
+	public function deleteByToken( string $token ): bool
+	{
+		$stmt = $this->_pdo->prepare( "DELETE FROM email_verification_tokens WHERE token = ?" );
+		$stmt->execute( [ $token ] );
+
+		return $stmt->rowCount() > 0;
+	}
+
+	/**
+	 * Delete all expired tokens
+	 */
+	public function deleteExpired(): int
+	{
+		$now = (new DateTimeImmutable())->format( 'Y-m-d H:i:s' );
+
+		$stmt = $this->_pdo->prepare( "DELETE FROM email_verification_tokens WHERE expires_at < ?" );
+		$stmt->execute( [ $now ] );
+
+		return $stmt->rowCount();
+	}
+
+	/**
+	 * Map database row to EmailVerificationToken object
+	 */
+	private function mapRowToToken( array $row ): EmailVerificationToken
+	{
+		return EmailVerificationToken::fromArray([
+			'id' => $row['id'],
+			'user_id' => $row['user_id'],
+			'token' => $row['token'],
+			'created_at' => $row['created_at'],
+			'expires_at' => $row['expires_at']
+		]);
+	}
+}
diff --git a/src/Cms/Repositories/IEmailVerificationTokenRepository.php b/src/Cms/Repositories/IEmailVerificationTokenRepository.php
new file mode 100644
index 0000000..d1dc353
--- /dev/null
+++ b/src/Cms/Repositories/IEmailVerificationTokenRepository.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Neuron\Cms\Repositories;
+
+use Neuron\Cms\Models\EmailVerificationToken;
+
+/**
+ * Email verification token repository interface.
+ *
+ * Defines methods for managing email verification tokens.
+ *
+ * @package Neuron\Cms\Repositories
+ */
+interface IEmailVerificationTokenRepository
+{
+	/**
+	 * Create a new email verification token
+	 *
+	 * @param EmailVerificationToken $token Token to create
+	 * @return EmailVerificationToken Created token with ID set
+	 */
+	public function create( EmailVerificationToken $token ): EmailVerificationToken;
+
+	/**
+	 * Find a token by its hashed value
+	 *
+	 * @param string $token Hashed token
+	 * @return EmailVerificationToken|null Token if found, null otherwise
+	 */
+	public function findByToken( string $token ): ?EmailVerificationToken;
+
+	/**
+	 * Find tokens by user ID
+	 *
+	 * @param int $userId User ID
+	 * @return EmailVerificationToken|null Most recent token if found, null otherwise
+	 */
+	public function findByUserId( int $userId ): ?EmailVerificationToken;
+
+	/**
+	 * Delete all tokens for a given user ID
+	 *
+	 * @param int $userId User ID
+	 * @return int Number of tokens deleted
+	 */
+	public function deleteByUserId( int $userId ): int;
+
+	/**
+	 * Delete a specific token by its hashed value
+	 *
+	 * @param string $token Hashed token
+	 * @return bool True if deleted, false otherwise
+	 */
+	public function deleteByToken( string $token ): bool;
+
+	/**
+	 * Delete all expired tokens
+	 *
+	 * @return int Number of tokens deleted
+	 */
+	public function deleteExpired(): int;
+}
diff --git a/src/Cms/Services/Member/RegistrationService.php b/src/Cms/Services/Member/RegistrationService.php
new file mode 100644
index 0000000..79baea6
--- /dev/null
+++ b/src/Cms/Services/Member/RegistrationService.php
@@ -0,0 +1,214 @@
+<?php
+
+namespace Neuron\Cms\Services\Member;
+
+use Neuron\Cms\Auth\EmailVerificationManager;
+use Neuron\Cms\Auth\PasswordHasher;
+use Neuron\Cms\Models\User;
+use Neuron\Cms\Repositories\IUserRepository;
+use Neuron\Data\Setting\SettingManager;
+use Neuron\Events\Emitter;
+use Neuron\Cms\Events\UserCreatedEvent;
+use Exception;
+
+/**
+ * Member registration service.
+ *
+ * Handles user registration, validation, and email verification.
+ *
+ * @package Neuron\Cms\Services\Member
+ */
+class RegistrationService
+{
+	private IUserRepository $_userRepository;
+	private PasswordHasher $_passwordHasher;
+	private EmailVerificationManager $_verificationManager;
+	private SettingManager $_settings;
+	private ?Emitter $_emitter;
+
+	/**
+	 * Constructor
+	 *
+	 * @param IUserRepository $userRepository User repository
+	 * @param PasswordHasher $passwordHasher Password hasher
+	 * @param EmailVerificationManager $verificationManager Email verification manager
+	 * @param SettingManager $settings Settings manager
+	 * @param Emitter|null $emitter Event emitter (optional)
+	 */
+	public function __construct(
+		IUserRepository $userRepository,
+		PasswordHasher $passwordHasher,
+		EmailVerificationManager $verificationManager,
+		SettingManager $settings,
+		?Emitter $emitter = null
+	)
+	{
+		$this->_userRepository = $userRepository;
+		$this->_passwordHasher = $passwordHasher;
+		$this->_verificationManager = $verificationManager;
+		$this->_settings = $settings;
+		$this->_emitter = $emitter;
+	}
+
+	/**
+	 * Check if registration is enabled
+	 *
+	 * @return bool True if registration is enabled, false otherwise
+	 */
+	public function isRegistrationEnabled(): bool
+	{
+		return $this->_settings->get( 'member', 'registration_enabled' ) ?? true;
+	}
+
+	/**
+	 * Register a new user
+	 *
+	 * @param string $username Username
+	 * @param string $email Email address
+	 * @param string $password Password
+	 * @param string $passwordConfirmation Password confirmation
+	 * @return User Created user
+	 * @throws Exception if registration is disabled or validation fails
+	 */
+	public function register(
+		string $username,
+		string $email,
+		string $password,
+		string $passwordConfirmation
+	): User
+	{
+		// Check if registration is enabled
+		if( !$this->isRegistrationEnabled() )
+		{
+			throw new Exception( 'User registration is currently disabled.' );
+		}
+
+		// Validate input
+		$this->validateRegistration( $username, $email, $password, $passwordConfirmation );
+
+		// Create user
+		$user = new User();
+		$user->setUsername( $username );
+		$user->setEmail( $email );
+		$user->setPasswordHash( $this->_passwordHasher->hash( $password ) );
+
+		// Set default role from settings
+		$defaultRole = $this->_settings->get( 'member', 'default_role' ) ?? User::ROLE_SUBSCRIBER;
+		$user->setRole( $defaultRole );
+
+		// Determine if email verification is required
+		$requireVerification = $this->_settings->get( 'member', 'require_email_verification' ) ?? true;
+
+		if( $requireVerification )
+		{
+			// User starts as inactive until email is verified
+			$user->setStatus( User::STATUS_INACTIVE );
+			$user->setEmailVerified( false );
+		}
+		else
+		{
+			// User is immediately active if verification not required
+			$user->setStatus( User::STATUS_ACTIVE );
+			$user->setEmailVerified( true );
+		}
+
+		// Create user in database
+		$this->_userRepository->create( $user );
+
+		// Send verification email if required
+		if( $requireVerification )
+		{
+			try
+			{
+				$this->_verificationManager->sendVerificationEmail( $user );
+			}
+			catch( Exception $e )
+			{
+				// Log error but don't fail registration
+				// User can request resend later
+			}
+		}
+
+		// Emit user created event
+		if( $this->_emitter )
+		{
+			$this->_emitter->emit( new UserCreatedEvent( $user ) );
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Validate registration data
+	 *
+	 * @param string $username Username
+	 * @param string $email Email address
+	 * @param string $password Password
+	 * @param string $passwordConfirmation Password confirmation
+	 * @throws Exception if validation fails
+	 */
+	private function validateRegistration(
+		string $username,
+		string $email,
+		string $password,
+		string $passwordConfirmation
+	): void
+	{
+		// Validate username
+		if( empty( $username ) )
+		{
+			throw new Exception( 'Username is required.' );
+		}
+
+		if( strlen( $username ) < 3 || strlen( $username ) > 50 )
+		{
+			throw new Exception( 'Username must be between 3 and 50 characters.' );
+		}
+
+		if( !preg_match( '/^[a-zA-Z0-9_]+$/', $username ) )
+		{
+			throw new Exception( 'Username can only contain letters, numbers, and underscores.' );
+		}
+
+		// Check if username is already taken
+		if( $this->_userRepository->findByUsername( $username ) )
+		{
+			throw new Exception( 'Username is already taken.' );
+		}
+
+		// Validate email
+		if( empty( $email ) )
+		{
+			throw new Exception( 'Email is required.' );
+		}
+
+		if( !filter_var( $email, FILTER_VALIDATE_EMAIL ) )
+		{
+			throw new Exception( 'Invalid email address.' );
+		}
+
+		// Check if email is already taken
+		if( $this->_userRepository->findByEmail( $email ) )
+		{
+			throw new Exception( 'Email is already registered.' );
+		}
+
+		// Validate password
+		if( empty( $password ) )
+		{
+			throw new Exception( 'Password is required.' );
+		}
+
+		if( $password !== $passwordConfirmation )
+		{
+			throw new Exception( 'Passwords do not match.' );
+		}
+
+		// Validate password strength
+		if( !$this->_passwordHasher->meetsRequirements( $password ) )
+		{
+			$errors = $this->_passwordHasher->getValidationErrors( $password );
+			throw new Exception( implode( ', ', $errors ) );
+		}
+	}
+}
diff --git a/tests/BootstrapTest.php b/tests/BootstrapTest.php
index 8e02270..fed29db 100644
--- a/tests/BootstrapTest.php
+++ b/tests/BootstrapTest.php
@@ -44,7 +44,7 @@ protected function tearDown(): void
 	 */
 	public function testBootWithValidConfig()
 	{
-		// Create config.yaml
+		// Create neuron.yaml
 		$configContent = <<<YAML
 system:
   base_path: /app
@@ -61,7 +61,7 @@ public function testBootWithValidConfig()
   url: http://test.com
 YAML;
 
-		vfsStream::newFile( 'config.yaml' )
+		vfsStream::newFile( 'neuron.yaml' )
 			->at( $this->root )
 			->setContent( $configContent );
 
@@ -81,7 +81,7 @@ public function testBootWithValidConfig()
 
 		// Update config to use virtual filesystem path
 		$configContent = str_replace( '/app', $basePath, $configContent );
-		$this->root->getChild( 'config.yaml' )->setContent( $configContent );
+		$this->root->getChild( 'neuron.yaml' )->setContent( $configContent );
 
 		// Boot the application
 		$app = Boot( $basePath );
diff --git a/tests/Cms/Auth/EmailVerificationManagerTest.php b/tests/Cms/Auth/EmailVerificationManagerTest.php
new file mode 100644
index 0000000..8f5a8fc
--- /dev/null
+++ b/tests/Cms/Auth/EmailVerificationManagerTest.php
@@ -0,0 +1,345 @@
+<?php
+
+namespace Tests\Cms\Auth;
+
+use Neuron\Cms\Auth\EmailVerificationManager;
+use Neuron\Cms\Models\EmailVerificationToken;
+use Neuron\Cms\Models\User;
+use Neuron\Cms\Repositories\IEmailVerificationTokenRepository;
+use Neuron\Cms\Repositories\IUserRepository;
+use Neuron\Data\Setting\Source\Memory;
+use Neuron\Data\Setting\SettingManager;
+use PHPUnit\Framework\TestCase;
+
+class EmailVerificationManagerTest extends TestCase
+{
+	private IEmailVerificationTokenRepository $_tokenRepository;
+	private IUserRepository $_userRepository;
+	private SettingManager $_settings;
+	private string $_basePath;
+	private string $_verificationUrl;
+	private EmailVerificationManager $_manager;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		// Create mock repositories
+		$this->_tokenRepository = $this->createMock( IEmailVerificationTokenRepository::class );
+		$this->_userRepository = $this->createMock( IUserRepository::class );
+
+		// Set up settings with Memory source wrapped in SettingManager
+		$memorySource = new Memory();
+		$memorySource->set( 'site', 'name', 'Test Site' );
+		$memorySource->set( 'site', 'url', 'http://test.com' );
+		$memorySource->set( 'email', 'from_address', 'test@example.com' );
+		$memorySource->set( 'email', 'from_name', 'Test Site' );
+		$memorySource->set( 'email', 'test_mode', true ); // Enable test mode to prevent actual email sending
+		$this->_settings = new SettingManager( $memorySource );
+
+		$this->_basePath = __DIR__ . '/../../..';
+		$this->_verificationUrl = 'http://test.com/verify-email';
+
+		// Create manager
+		$this->_manager = new EmailVerificationManager(
+			$this->_tokenRepository,
+			$this->_userRepository,
+			$this->_settings,
+			$this->_basePath,
+			$this->_verificationUrl
+		);
+	}
+
+	public function testConstructorSetsProperties(): void
+	{
+		$this->assertInstanceOf( EmailVerificationManager::class, $this->_manager );
+	}
+
+	public function testSetTokenExpirationMinutes(): void
+	{
+		$result = $this->_manager->setTokenExpirationMinutes( 120 );
+		$this->assertInstanceOf( EmailVerificationManager::class, $result );
+	}
+
+	public function testSendVerificationEmail(): void
+	{
+		// Create mock user
+		$user = new User();
+		$user->setId( 1 );
+		$user->setEmail( 'user@example.com' );
+		$user->setUsername( 'testuser' );
+
+		// Expect old tokens to be deleted
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'deleteByUserId' )
+			->with( $user->getId() );
+
+		// Expect new token to be created
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'create' )
+			->with( $this->isInstanceOf( EmailVerificationToken::class ) );
+
+		// Send verification email (in test mode, email won't actually be sent)
+		$result = $this->_manager->sendVerificationEmail( $user );
+
+		$this->assertTrue( $result );
+	}
+
+	public function testValidateTokenWithValidToken(): void
+	{
+		$plainToken = bin2hex( random_bytes( 32 ) );
+		$hashedToken = hash( 'sha256', $plainToken );
+
+		// Create mock token
+		$token = new EmailVerificationToken( 123, $hashedToken, 60 );
+
+		// Repository finds token
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'findByToken' )
+			->with( $hashedToken )
+			->willReturn( $token );
+
+		$result = $this->_manager->validateToken( $plainToken );
+
+		$this->assertInstanceOf( EmailVerificationToken::class, $result );
+		$this->assertEquals( 123, $result->getUserId() );
+	}
+
+	public function testValidateTokenWithInvalidToken(): void
+	{
+		$plainToken = bin2hex( random_bytes( 32 ) );
+		$hashedToken = hash( 'sha256', $plainToken );
+
+		// Repository doesn't find token
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'findByToken' )
+			->with( $hashedToken )
+			->willReturn( null );
+
+		$result = $this->_manager->validateToken( $plainToken );
+
+		$this->assertNull( $result );
+	}
+
+	public function testValidateTokenWithExpiredToken(): void
+	{
+		$plainToken = bin2hex( random_bytes( 32 ) );
+		$hashedToken = hash( 'sha256', $plainToken );
+
+		// Create expired token (negative expiration)
+		$token = new EmailVerificationToken( 123, $hashedToken, -10 );
+
+		// Repository finds token
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'findByToken' )
+			->with( $hashedToken )
+			->willReturn( $token );
+
+		$result = $this->_manager->validateToken( $plainToken );
+
+		$this->assertNull( $result );
+	}
+
+	public function testVerifyEmailWithValidToken(): void
+	{
+		$plainToken = bin2hex( random_bytes( 32 ) );
+		$hashedToken = hash( 'sha256', $plainToken );
+		$userId = 123;
+
+		// Create mock token
+		$token = new EmailVerificationToken( $userId, $hashedToken, 60 );
+
+		// Create mock user
+		$user = new User();
+		$user->setId( $userId );
+		$user->setUsername( 'testuser' );
+		$user->setEmail( 'user@example.com' );
+		$user->setEmailVerified( false );
+		$user->setStatus( User::STATUS_INACTIVE );
+
+		// Repository finds token
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'findByToken' )
+			->with( $hashedToken )
+			->willReturn( $token );
+
+		// Repository finds user
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findById' )
+			->with( $userId )
+			->willReturn( $user );
+
+		// User repository updates user
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'update' )
+			->with( $this->callback( function( $updatedUser ) {
+				return $updatedUser->isEmailVerified() === true &&
+				       $updatedUser->getStatus() === User::STATUS_ACTIVE;
+			} ) );
+
+		// Token is deleted after use
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'deleteByToken' )
+			->with( $hashedToken );
+
+		$result = $this->_manager->verifyEmail( $plainToken );
+
+		$this->assertTrue( $result );
+	}
+
+	public function testVerifyEmailWithInvalidToken(): void
+	{
+		$plainToken = bin2hex( random_bytes( 32 ) );
+		$hashedToken = hash( 'sha256', $plainToken );
+
+		// Repository doesn't find token
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'findByToken' )
+			->with( $hashedToken )
+			->willReturn( null );
+
+		$result = $this->_manager->verifyEmail( $plainToken );
+
+		$this->assertFalse( $result );
+	}
+
+	public function testVerifyEmailAlreadyVerified(): void
+	{
+		$plainToken = bin2hex( random_bytes( 32 ) );
+		$hashedToken = hash( 'sha256', $plainToken );
+		$userId = 123;
+
+		// Create mock token
+		$token = new EmailVerificationToken( $userId, $hashedToken, 60 );
+
+		// Create mock user that's already verified
+		$user = new User();
+		$user->setId( $userId );
+		$user->setUsername( 'testuser' );
+		$user->setEmail( 'user@example.com' );
+		$user->setEmailVerified( true );
+
+		// Repository finds token
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'findByToken' )
+			->with( $hashedToken )
+			->willReturn( $token );
+
+		// Repository finds user
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findById' )
+			->with( $userId )
+			->willReturn( $user );
+
+		// Token should still be deleted
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'deleteByToken' )
+			->with( $hashedToken );
+
+		$result = $this->_manager->verifyEmail( $plainToken );
+
+		$this->assertTrue( $result );
+	}
+
+	public function testResendVerificationWithNonexistentUser(): void
+	{
+		$email = 'nonexistent@example.com';
+
+		// User repository returns null
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByEmail' )
+			->with( $email )
+			->willReturn( null );
+
+		// Should still return true (don't reveal if user exists)
+		$result = $this->_manager->resendVerification( $email );
+
+		$this->assertTrue( $result );
+	}
+
+	public function testResendVerificationWithAlreadyVerified(): void
+	{
+		$email = 'verified@example.com';
+
+		// Create already verified user
+		$user = new User();
+		$user->setId( 1 );
+		$user->setUsername( 'verifieduser' );
+		$user->setEmail( $email );
+		$user->setEmailVerified( true );
+
+		// User repository finds user
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByEmail' )
+			->with( $email )
+			->willReturn( $user );
+
+		// Should return false (already verified)
+		$result = $this->_manager->resendVerification( $email );
+
+		$this->assertFalse( $result );
+	}
+
+	public function testResendVerificationWithUnverifiedUser(): void
+	{
+		$email = 'unverified@example.com';
+
+		// Create unverified user
+		$user = new User();
+		$user->setId( 1 );
+		$user->setUsername( 'unverifieduser' );
+		$user->setEmail( $email );
+		$user->setEmailVerified( false );
+
+		// User repository finds user
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByEmail' )
+			->with( $email )
+			->willReturn( $user );
+
+		// Expect old tokens to be deleted
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'deleteByUserId' )
+			->with( $user->getId() );
+
+		// Expect new token to be created
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'create' )
+			->with( $this->isInstanceOf( EmailVerificationToken::class ) );
+
+		$result = $this->_manager->resendVerification( $email );
+
+		$this->assertTrue( $result );
+	}
+
+	public function testCleanupExpiredTokens(): void
+	{
+		// Token repository deletes expired tokens
+		$this->_tokenRepository
+			->expects( $this->once() )
+			->method( 'deleteExpired' )
+			->willReturn( 5 );
+
+		$result = $this->_manager->cleanupExpiredTokens();
+
+		$this->assertEquals( 5, $result );
+	}
+}
diff --git a/tests/Cms/Auth/MemberAuthenticationFilterTest.php b/tests/Cms/Auth/MemberAuthenticationFilterTest.php
new file mode 100644
index 0000000..65aaf20
--- /dev/null
+++ b/tests/Cms/Auth/MemberAuthenticationFilterTest.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace Tests\Cms\Auth;
+
+use Neuron\Cms\Auth\AuthManager;
+use Neuron\Cms\Auth\Filters\MemberAuthenticationFilter;
+use Neuron\Cms\Models\User;
+use Neuron\Routing\RouteMap;
+use Neuron\Patterns\Registry;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class MemberAuthenticationFilterTest extends TestCase
+{
+	private AuthManager $_authManager;
+	private MemberAuthenticationFilter $_filter;
+	private RouteMap $_route;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		// Create mock auth manager
+		$this->_authManager = $this->createMock( AuthManager::class );
+
+		// Create filter
+		$this->_filter = new MemberAuthenticationFilter( $this->_authManager, '/login', true );
+
+		// Create mock route
+		$this->_route = $this->createMock( RouteMap::class );
+		$this->_route->method( 'getPath' )->willReturn( '/member/dashboard' );
+
+		// Clear Registry
+		Registry::getInstance()->reset();
+	}
+
+	protected function tearDown(): void
+	{
+		parent::tearDown();
+		Registry::getInstance()->reset();
+	}
+
+	public function testConstructor(): void
+	{
+		$this->assertInstanceOf( MemberAuthenticationFilter::class, $this->_filter );
+	}
+
+	public function testSetLoginUrl(): void
+	{
+		$result = $this->_filter->setLoginUrl( '/custom-login' );
+		$this->assertInstanceOf( MemberAuthenticationFilter::class, $result );
+	}
+
+	public function testSetVerifyEmailUrl(): void
+	{
+		$result = $this->_filter->setVerifyEmailUrl( '/custom-verify' );
+		$this->assertInstanceOf( MemberAuthenticationFilter::class, $result );
+	}
+
+	public function testSetRequireEmailVerification(): void
+	{
+		$result = $this->_filter->setRequireEmailVerification( false );
+		$this->assertInstanceOf( MemberAuthenticationFilter::class, $result );
+	}
+
+	public function testBeforeWithAuthenticatedAndVerifiedUser(): void
+	{
+		// Create verified user
+		$user = new User();
+		$user->setId( 1 );
+		$user->setUsername( 'testuser' );
+		$user->setEmailVerified( true );
+
+		// Auth manager returns user
+		$this->_authManager
+			->method( 'user' )
+			->willReturn( $user );
+
+		// This should set user in Registry and not redirect
+		$this->_filter->pre( $this->_route );
+
+		// Verify user was set in Registry
+		$this->assertEquals( $user, Registry::getInstance()->get( 'Auth.User' ) );
+		$this->assertEquals( 1, Registry::getInstance()->get( 'Auth.UserId' ) );
+	}
+
+	/**
+	 * Testing redirects with exit() is problematic in PHPUnit.
+	 * This test verifies the conditions that would trigger a redirect.
+	 */
+	public function testBeforeWithUnauthenticatedUser(): void
+	{
+		// Auth manager returns null (no user)
+		$this->_authManager
+			->method( 'user' )
+			->willReturn( null );
+
+		// We can't easily test exit() behavior, but we can verify the condition
+		// In a real scenario, this would redirect and exit
+		// For testing, we just verify the user() method is called
+		$this->assertNull( $this->_authManager->user() );
+
+		// Note: In production, calling $this->_filter->pre() would trigger redirect and exit
+		// We skip that here to avoid process termination in tests
+		$this->markTestIncomplete( 'Testing exit() behavior requires different approach' );
+	}
+
+	/**
+	 * Testing redirects with exit() is problematic in PHPUnit.
+	 * This test verifies the conditions that would trigger a redirect.
+	 */
+	public function testBeforeWithUnverifiedUser(): void
+	{
+		// Create unverified user
+		$user = new User();
+		$user->setId( 1 );
+		$user->setUsername( 'testuser' );
+		$user->setEmailVerified( false );
+
+		// Auth manager returns unverified user
+		$this->_authManager
+			->method( 'user' )
+			->willReturn( $user );
+
+		// Filter requires verification
+		$filter = new MemberAuthenticationFilter( $this->_authManager, '/login', true );
+
+		// Verify user is unverified and filter requires verification
+		$this->assertFalse( $user->isEmailVerified() );
+
+		// Note: In production, calling $filter->pre() would trigger redirect and exit
+		// We skip that here to avoid process termination in tests
+		$this->markTestIncomplete( 'Testing exit() behavior requires different approach' );
+	}
+
+	public function testBeforeWithUnverifiedUserButVerificationNotRequired(): void
+	{
+		// Create unverified user
+		$user = new User();
+		$user->setId( 1 );
+		$user->setUsername( 'testuser' );
+		$user->setEmailVerified( false );
+
+		// Auth manager returns unverified user
+		$this->_authManager
+			->method( 'user' )
+			->willReturn( $user );
+
+		// Filter doesn't require verification
+		$filter = new MemberAuthenticationFilter( $this->_authManager, '/login', false );
+
+		// This should NOT redirect, even though user is unverified
+		$filter->pre( $this->_route );
+
+		// Verify user was set in Registry
+		$this->assertEquals( $user, Registry::getInstance()->get( 'Auth.User' ) );
+	}
+}
diff --git a/tests/Cms/BlogControllerTest.php b/tests/Cms/BlogControllerTest.php
index 5b32570..b5f8f28 100644
--- a/tests/Cms/BlogControllerTest.php
+++ b/tests/Cms/BlogControllerTest.php
@@ -68,6 +68,15 @@ protected function setUp(): void
 		Registry::getInstance()->set( 'Base.Path', __DIR__ . '/../..' );
 		Registry::getInstance()->set( 'Views.Path', __DIR__ . '/../../resources/views' );
 
+		// Initialize ViewDataProvider for tests
+		$provider = \Neuron\Mvc\Views\ViewDataProvider::getInstance();
+		$provider->share( 'siteName', 'Test Site' );
+		$provider->share( 'appVersion', '1.0.0-test' );
+		$provider->share( 'currentUser', null );
+		$provider->share( 'theme', 'sandstone' );
+		$provider->share( 'currentYear', fn() => date('Y') );
+		$provider->share( 'isAuthenticated', false );
+
 		// Initialize repositories with our test PDO
 		$this->initializeRepositories();
 	}
diff --git a/tests/Cms/Cli/Commands/Install/InstallCommandTest.php b/tests/Cms/Cli/Commands/Install/InstallCommandTest.php
index 1f27d90..3322e69 100644
--- a/tests/Cms/Cli/Commands/Install/InstallCommandTest.php
+++ b/tests/Cms/Cli/Commands/Install/InstallCommandTest.php
@@ -106,42 +106,18 @@ public function testYamlValueFormatsStringsCorrectly(): void
 		$this->assertEquals('simple', $method->invoke($command, 'simple'));
 	}
 
-	public function testCamelToSnakeConvertsCorrectly(): void
+	public function testCopyMigrationsMethodExists(): void
 	{
 		$command = new InstallCommand();
 
-		// Use reflection to call private method
+		// Verify the new copyMigrations method exists
 		$reflection = new \ReflectionClass($command);
-		$method = $reflection->getMethod('camelToSnake');
-		$method->setAccessible(true);
+		$this->assertTrue($reflection->hasMethod('copyMigrations'));
 
-		$this->assertEquals('create_users_table', $method->invoke($command, 'CreateUsersTable'));
-		$this->assertEquals('add_index', $method->invoke($command, 'AddIndex'));
-		$this->assertEquals('simple', $method->invoke($command, 'simple'));
+		$method = $reflection->getMethod('copyMigrations');
+		$this->assertTrue($method->isPrivate());
 	}
 
-	public function testGetMigrationTemplateGeneratesValidPhp(): void
-	{
-		$command = new InstallCommand();
-
-		// Use reflection to call private method
-		$reflection = new \ReflectionClass($command);
-		$method = $reflection->getMethod('getMigrationTemplate');
-		$method->setAccessible(true);
-
-		$result = $method->invoke($command, 'CreateUsersTable');
-
-		$this->assertIsString($result);
-		$this->assertStringContainsString('<?php', $result);
-		$this->assertStringContainsString('class CreateUsersTable extends AbstractMigration', $result);
-		$this->assertStringContainsString('public function change()', $result);
-		$this->assertStringContainsString('->addColumn( \'username\'', $result);
-		$this->assertStringContainsString('->addColumn( \'email\'', $result);
-		$this->assertStringContainsString('->addColumn( \'password_hash\'', $result);
-		$this->assertStringContainsString('->addIndex( [ \'username\' ]', $result);
-	}
-
-
 	/**
 	 * Helper to set stdin input for testing
 	 */
diff --git a/tests/Cms/Cli/Commands/User/CreateCommandTest.php b/tests/Cms/Cli/Commands/User/CreateCommandTest.php
index 63e79f0..4a817e0 100644
--- a/tests/Cms/Cli/Commands/User/CreateCommandTest.php
+++ b/tests/Cms/Cli/Commands/User/CreateCommandTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
   name: :memory:
 YAML;
 
-		vfsStream::newFile('config/config.yaml')
+		vfsStream::newFile('config/neuron.yaml')
 			->at($this->root)
 			->setContent($configContent);
 	}
diff --git a/tests/Cms/Maintenance/MaintenanceConfigTest.php b/tests/Cms/Maintenance/MaintenanceConfigTest.php
index a09f886..657c38c 100644
--- a/tests/Cms/Maintenance/MaintenanceConfigTest.php
+++ b/tests/Cms/Maintenance/MaintenanceConfigTest.php
@@ -55,11 +55,11 @@ public function testConfigFromSettingsSource(): void
   show_countdown: true
 YAML;
 
-		vfsStream::newFile( 'config.yaml' )
+		vfsStream::newFile( 'neuron.yaml' )
 			->at( $this->root )
 			->setContent( $configContent );
 
-		$settings = new Yaml( vfsStream::url( 'test/config.yaml' ) );
+		$settings = new Yaml( vfsStream::url( 'test/neuron.yaml' ) );
 		$config = new MaintenanceConfig( $settings );
 
 		$this->assertTrue( $config->isEnabled() );
@@ -82,11 +82,11 @@ public function testFromSettingsFactory(): void
   default_message: "Site maintenance"
 YAML;
 
-		vfsStream::newFile( 'config.yaml' )
+		vfsStream::newFile( 'neuron.yaml' )
 			->at( $this->root )
 			->setContent( $configContent );
 
-		$settings = new Yaml( vfsStream::url( 'test/config.yaml' ) );
+		$settings = new Yaml( vfsStream::url( 'test/neuron.yaml' ) );
 		$config = MaintenanceConfig::fromSettings( $settings );
 
 		$this->assertInstanceOf( MaintenanceConfig::class, $config );
@@ -104,11 +104,11 @@ public function testAllowedIpsAsString(): void
   allowed_ips: "192.168.1.1, 10.0.0.1, 172.16.0.0/16"
 YAML;
 
-		vfsStream::newFile( 'config.yaml' )
+		vfsStream::newFile( 'neuron.yaml' )
 			->at( $this->root )
 			->setContent( $configContent );
 
-		$settings = new Yaml( vfsStream::url( 'test/config.yaml' ) );
+		$settings = new Yaml( vfsStream::url( 'test/neuron.yaml' ) );
 		$config = new MaintenanceConfig( $settings );
 
 		$ips = $config->getAllowedIps();
@@ -128,11 +128,11 @@ public function testPartialConfigUsesDefaults(): void
   default_message: "Only message specified"
 YAML;
 
-		vfsStream::newFile( 'config.yaml' )
+		vfsStream::newFile( 'neuron.yaml' )
 			->at( $this->root )
 			->setContent( $configContent );
 
-		$settings = new Yaml( vfsStream::url( 'test/config.yaml' ) );
+		$settings = new Yaml( vfsStream::url( 'test/neuron.yaml' ) );
 		$config = new MaintenanceConfig( $settings );
 
 		$this->assertEquals( 'Only message specified', $config->getDefaultMessage() );
@@ -152,11 +152,11 @@ public function testEmptyConfigUsesDefaults(): void
   name: Test Site
 YAML;
 
-		vfsStream::newFile( 'config.yaml' )
+		vfsStream::newFile( 'neuron.yaml' )
 			->at( $this->root )
 			->setContent( $configContent );
 
-		$settings = new Yaml( vfsStream::url( 'test/config.yaml' ) );
+		$settings = new Yaml( vfsStream::url( 'test/neuron.yaml' ) );
 		$config = new MaintenanceConfig( $settings );
 
 		// Should all be defaults
diff --git a/tests/Cms/Models/EmailVerificationTokenTest.php b/tests/Cms/Models/EmailVerificationTokenTest.php
new file mode 100644
index 0000000..31b82e7
--- /dev/null
+++ b/tests/Cms/Models/EmailVerificationTokenTest.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Tests\Cms\Models;
+
+use Neuron\Cms\Models\EmailVerificationToken;
+use PHPUnit\Framework\TestCase;
+use DateTimeImmutable;
+
+class EmailVerificationTokenTest extends TestCase
+{
+	public function testConstructorSetsDefaultValues(): void
+	{
+		$userId = 123;
+		$token = 'hashed-token';
+		$expirationMinutes = 60;
+
+		$verificationToken = new EmailVerificationToken( $userId, $token, $expirationMinutes );
+
+		$this->assertEquals( $userId, $verificationToken->getUserId() );
+		$this->assertEquals( $token, $verificationToken->getToken() );
+		$this->assertInstanceOf( DateTimeImmutable::class, $verificationToken->getCreatedAt() );
+		$this->assertInstanceOf( DateTimeImmutable::class, $verificationToken->getExpiresAt() );
+	}
+
+	public function testExpirationTimeCalculation(): void
+	{
+		$userId = 123;
+		$token = 'hashed-token';
+		$expirationMinutes = 30;
+
+		$verificationToken = new EmailVerificationToken( $userId, $token, $expirationMinutes );
+
+		$createdAt = $verificationToken->getCreatedAt();
+		$expiresAt = $verificationToken->getExpiresAt();
+
+		// Calculate the difference in minutes
+		$diff = $createdAt->diff( $expiresAt );
+		$minutesDiff = ( $diff->h * 60 ) + $diff->i;
+
+		$this->assertEquals( $expirationMinutes, $minutesDiff );
+	}
+
+	public function testGettersAndSetters(): void
+	{
+		$token = new EmailVerificationToken();
+
+		$token->setId( 1 );
+		$this->assertEquals( 1, $token->getId() );
+
+		$token->setUserId( 456 );
+		$this->assertEquals( 456, $token->getUserId() );
+
+		$token->setToken( 'new-token-hash' );
+		$this->assertEquals( 'new-token-hash', $token->getToken() );
+
+		$createdAt = new DateTimeImmutable( '2024-01-01 12:00:00' );
+		$token->setCreatedAt( $createdAt );
+		$this->assertEquals( $createdAt, $token->getCreatedAt() );
+
+		$expiresAt = new DateTimeImmutable( '2024-01-01 13:00:00' );
+		$token->setExpiresAt( $expiresAt );
+		$this->assertEquals( $expiresAt, $token->getExpiresAt() );
+	}
+
+	public function testIsExpiredReturnsFalseForFutureExpiration(): void
+	{
+		$userId = 123;
+		$token = 'hashed-token';
+		$expirationMinutes = 60;
+
+		$verificationToken = new EmailVerificationToken( $userId, $token, $expirationMinutes );
+
+		$this->assertFalse( $verificationToken->isExpired() );
+	}
+
+	public function testIsExpiredReturnsTrueForPastExpiration(): void
+	{
+		$token = new EmailVerificationToken();
+		$token->setUserId( 123 );
+		$token->setToken( 'hashed-token' );
+		$token->setCreatedAt( new DateTimeImmutable( '2020-01-01 12:00:00' ) );
+		$token->setExpiresAt( new DateTimeImmutable( '2020-01-01 13:00:00' ) );
+
+		$this->assertTrue( $token->isExpired() );
+	}
+
+	public function testToArray(): void
+	{
+		$userId = 123;
+		$tokenHash = 'hashed-token';
+
+		$token = new EmailVerificationToken( $userId, $tokenHash, 60 );
+		$token->setId( 1 );
+
+		$array = $token->toArray();
+
+		$this->assertIsArray( $array );
+		$this->assertEquals( 1, $array['id'] );
+		$this->assertEquals( $userId, $array['user_id'] );
+		$this->assertEquals( $tokenHash, $array['token'] );
+		$this->assertArrayHasKey( 'created_at', $array );
+		$this->assertArrayHasKey( 'expires_at', $array );
+	}
+
+	public function testFromArray(): void
+	{
+		$data = [
+			'id' => 1,
+			'user_id' => 456,
+			'token' => 'test-token-hash',
+			'created_at' => '2024-01-01 12:00:00',
+			'expires_at' => '2024-01-01 13:00:00'
+		];
+
+		$token = EmailVerificationToken::fromArray( $data );
+
+		$this->assertEquals( 1, $token->getId() );
+		$this->assertEquals( 456, $token->getUserId() );
+		$this->assertEquals( 'test-token-hash', $token->getToken() );
+		$this->assertEquals( '2024-01-01 12:00:00', $token->getCreatedAt()->format( 'Y-m-d H:i:s' ) );
+		$this->assertEquals( '2024-01-01 13:00:00', $token->getExpiresAt()->format( 'Y-m-d H:i:s' ) );
+	}
+
+	public function testFromArrayWithPartialData(): void
+	{
+		$data = [
+			'user_id' => 789,
+			'token' => 'partial-token-hash'
+		];
+
+		$token = EmailVerificationToken::fromArray( $data );
+
+		$this->assertNull( $token->getId() );
+		$this->assertEquals( 789, $token->getUserId() );
+		$this->assertEquals( 'partial-token-hash', $token->getToken() );
+	}
+}
diff --git a/tests/Cms/Repositories/DatabaseEmailVerificationTokenRepositoryTest.php b/tests/Cms/Repositories/DatabaseEmailVerificationTokenRepositoryTest.php
new file mode 100644
index 0000000..257d2bf
--- /dev/null
+++ b/tests/Cms/Repositories/DatabaseEmailVerificationTokenRepositoryTest.php
@@ -0,0 +1,247 @@
+<?php
+
+namespace Neuron\Cms\Tests\Repositories;
+
+use PHPUnit\Framework\TestCase;
+use Neuron\Cms\Repositories\DatabaseEmailVerificationTokenRepository;
+use Neuron\Cms\Models\EmailVerificationToken;
+use Neuron\Data\Setting\SettingManager;
+use PDO;
+use DateTimeImmutable;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class DatabaseEmailVerificationTokenRepositoryTest extends TestCase
+{
+	private DatabaseEmailVerificationTokenRepository $repository;
+	private PDO $pdo;
+	private string $dbPath;
+
+	protected function setUp(): void
+	{
+		// Create in-memory SQLite database for testing
+		$this->dbPath = ':memory:';
+
+		$config = [
+			'adapter' => 'sqlite',
+			'name' => $this->dbPath
+		];
+
+		// Mock SettingManager
+		$settings = $this->createMock( SettingManager::class );
+		$settings->method( 'getSection' )
+			->with( 'database' )
+			->willReturn( $config );
+
+		$this->repository = new DatabaseEmailVerificationTokenRepository( $settings );
+
+		// Get PDO connection via reflection to create table
+		$reflection = new \ReflectionClass( $this->repository );
+		$property = $reflection->getProperty( '_pdo' );
+		$property->setAccessible( true );
+		$this->pdo = $property->getValue( $this->repository );
+
+		// Create tables
+		$this->createTables();
+	}
+
+	private function createTables(): void
+	{
+		// Create users table (needed for foreign key)
+		$sql = "
+			CREATE TABLE users (
+				id INTEGER PRIMARY KEY AUTOINCREMENT,
+				username VARCHAR(255) UNIQUE NOT NULL,
+				email VARCHAR(255) UNIQUE NOT NULL,
+				password_hash VARCHAR(255) NOT NULL
+			)
+		";
+		$this->pdo->exec( $sql );
+
+		// Create email_verification_tokens table
+		$sql = "
+			CREATE TABLE email_verification_tokens (
+				id INTEGER PRIMARY KEY AUTOINCREMENT,
+				user_id INTEGER NOT NULL,
+				token VARCHAR(64) NOT NULL,
+				created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+				expires_at TIMESTAMP NOT NULL,
+				FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+			)
+		";
+		$this->pdo->exec( $sql );
+
+		// Insert a test user
+		$stmt = $this->pdo->prepare( "INSERT INTO users (username, email, password_hash) VALUES (?, ?, ?)" );
+		$stmt->execute( ['testuser', 'test@example.com', 'hash123'] );
+	}
+
+	public function testConstructor(): void
+	{
+		$this->assertInstanceOf( DatabaseEmailVerificationTokenRepository::class, $this->repository );
+	}
+
+	public function testCreateToken(): void
+	{
+		$userId = 1;
+		$tokenHash = hash( 'sha256', 'test-token' );
+		$token = new EmailVerificationToken( $userId, $tokenHash, 60 );
+
+		$createdToken = $this->repository->create( $token );
+
+		$this->assertInstanceOf( EmailVerificationToken::class, $createdToken );
+		$this->assertNotNull( $createdToken->getId() );
+		$this->assertEquals( $userId, $createdToken->getUserId() );
+		$this->assertEquals( $tokenHash, $createdToken->getToken() );
+	}
+
+	public function testFindByToken(): void
+	{
+		// Create a token
+		$userId = 1;
+		$tokenHash = hash( 'sha256', 'find-test-token' );
+		$token = new EmailVerificationToken( $userId, $tokenHash, 60 );
+		$this->repository->create( $token );
+
+		// Find it
+		$foundToken = $this->repository->findByToken( $tokenHash );
+
+		$this->assertInstanceOf( EmailVerificationToken::class, $foundToken );
+		$this->assertEquals( $userId, $foundToken->getUserId() );
+		$this->assertEquals( $tokenHash, $foundToken->getToken() );
+	}
+
+	public function testFindByTokenNotFound(): void
+	{
+		$foundToken = $this->repository->findByToken( 'nonexistent-token-hash' );
+
+		$this->assertNull( $foundToken );
+	}
+
+	public function testFindByUserId(): void
+	{
+		// Create multiple tokens for same user using manual insert to control timestamps
+		$userId = 1;
+
+		// Insert first token (older)
+		$stmt = $this->pdo->prepare(
+			"INSERT INTO email_verification_tokens (user_id, token, created_at, expires_at)
+			 VALUES (?, ?, ?, ?)"
+		);
+		$stmt->execute([
+			$userId,
+			hash( 'sha256', 'token1' ),
+			'2024-01-01 12:00:00',
+			'2024-01-01 13:00:00'
+		]);
+
+		// Insert second token (newer)
+		$stmt->execute([
+			$userId,
+			hash( 'sha256', 'token2' ),
+			'2024-01-01 12:05:00',
+			'2024-01-01 13:05:00'
+		]);
+
+		// Find should return most recent
+		$foundToken = $this->repository->findByUserId( $userId );
+
+		$this->assertInstanceOf( EmailVerificationToken::class, $foundToken );
+		$this->assertEquals( $userId, $foundToken->getUserId() );
+		$this->assertEquals( hash( 'sha256', 'token2' ), $foundToken->getToken() );
+	}
+
+	public function testFindByUserIdNotFound(): void
+	{
+		$foundToken = $this->repository->findByUserId( 999 );
+
+		$this->assertNull( $foundToken );
+	}
+
+	public function testDeleteByUserId(): void
+	{
+		// Create tokens for user
+		$userId = 1;
+		$token1 = new EmailVerificationToken( $userId, hash( 'sha256', 'delete-token1' ), 60 );
+		$token2 = new EmailVerificationToken( $userId, hash( 'sha256', 'delete-token2' ), 60 );
+
+		$this->repository->create( $token1 );
+		$this->repository->create( $token2 );
+
+		// Delete all tokens for user
+		$deleteCount = $this->repository->deleteByUserId( $userId );
+
+		$this->assertEquals( 2, $deleteCount );
+
+		// Verify they're gone
+		$foundToken = $this->repository->findByUserId( $userId );
+		$this->assertNull( $foundToken );
+	}
+
+	public function testDeleteByToken(): void
+	{
+		// Create a token
+		$userId = 1;
+		$tokenHash = hash( 'sha256', 'delete-by-token' );
+		$token = new EmailVerificationToken( $userId, $tokenHash, 60 );
+		$this->repository->create( $token );
+
+		// Delete it
+		$result = $this->repository->deleteByToken( $tokenHash );
+
+		$this->assertTrue( $result );
+
+		// Verify it's gone
+		$foundToken = $this->repository->findByToken( $tokenHash );
+		$this->assertNull( $foundToken );
+	}
+
+	public function testDeleteByTokenNotFound(): void
+	{
+		$result = $this->repository->deleteByToken( 'nonexistent-token' );
+
+		$this->assertFalse( $result );
+	}
+
+	public function testDeleteExpired(): void
+	{
+		// Create an expired token
+		$userId = 1;
+		$expiredToken = new EmailVerificationToken();
+		$expiredToken->setUserId( $userId );
+		$expiredToken->setToken( hash( 'sha256', 'expired-token' ) );
+		$expiredToken->setCreatedAt( new DateTimeImmutable( '2020-01-01 12:00:00' ) );
+		$expiredToken->setExpiresAt( new DateTimeImmutable( '2020-01-01 13:00:00' ) );
+
+		// Manually insert expired token
+		$stmt = $this->pdo->prepare(
+			"INSERT INTO email_verification_tokens (user_id, token, created_at, expires_at)
+			 VALUES (?, ?, ?, ?)"
+		);
+		$stmt->execute([
+			$expiredToken->getUserId(),
+			$expiredToken->getToken(),
+			$expiredToken->getCreatedAt()->format( 'Y-m-d H:i:s' ),
+			$expiredToken->getExpiresAt()->format( 'Y-m-d H:i:s' )
+		]);
+
+		// Create a valid token
+		$validToken = new EmailVerificationToken( $userId, hash( 'sha256', 'valid-token' ), 60 );
+		$this->repository->create( $validToken );
+
+		// Delete expired tokens
+		$deleteCount = $this->repository->deleteExpired();
+
+		$this->assertEquals( 1, $deleteCount );
+
+		// Verify expired token is gone
+		$foundExpired = $this->repository->findByToken( $expiredToken->getToken() );
+		$this->assertNull( $foundExpired );
+
+		// Verify valid token still exists
+		$foundValid = $this->repository->findByToken( $validToken->getToken() );
+		$this->assertNotNull( $foundValid );
+	}
+}
diff --git a/tests/Cms/Services/RegistrationServiceTest.php b/tests/Cms/Services/RegistrationServiceTest.php
new file mode 100644
index 0000000..4c9b5fb
--- /dev/null
+++ b/tests/Cms/Services/RegistrationServiceTest.php
@@ -0,0 +1,300 @@
+<?php
+
+namespace Tests\Cms\Services;
+
+use Neuron\Cms\Auth\EmailVerificationManager;
+use Neuron\Cms\Auth\PasswordHasher;
+use Neuron\Cms\Models\User;
+use Neuron\Cms\Repositories\IUserRepository;
+use Neuron\Cms\Services\Member\RegistrationService;
+use Neuron\Data\Setting\Source\Memory;
+use Neuron\Data\Setting\SettingManager;
+use Neuron\Events\Emitter;
+use PHPUnit\Framework\TestCase;
+
+class RegistrationServiceTest extends TestCase
+{
+	private IUserRepository $_userRepository;
+	private PasswordHasher $_passwordHasher;
+	private EmailVerificationManager $_verificationManager;
+	private SettingManager $_settings;
+	private Emitter $_emitter;
+	private RegistrationService $_service;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		// Create mocks
+		$this->_userRepository = $this->createMock( IUserRepository::class );
+		$this->_passwordHasher = new PasswordHasher();
+		$this->_verificationManager = $this->createMock( EmailVerificationManager::class );
+		$this->_emitter = $this->createMock( Emitter::class );
+
+		// Set up settings with Memory source
+		$memorySource = new Memory();
+		$memorySource->set( 'member', 'registration_enabled', true );
+		$memorySource->set( 'member', 'require_email_verification', true );
+		$memorySource->set( 'member', 'default_role', User::ROLE_SUBSCRIBER );
+		$this->_settings = new SettingManager( $memorySource );
+
+		// Create service
+		$this->_service = new RegistrationService(
+			$this->_userRepository,
+			$this->_passwordHasher,
+			$this->_verificationManager,
+			$this->_settings,
+			$this->_emitter
+		);
+	}
+
+	public function testConstructor(): void
+	{
+		$this->assertInstanceOf( RegistrationService::class, $this->_service );
+	}
+
+	public function testIsRegistrationEnabledReturnsTrue(): void
+	{
+		$result = $this->_service->isRegistrationEnabled();
+		$this->assertTrue( $result );
+	}
+
+	public function testIsRegistrationEnabledReturnsFalse(): void
+	{
+		// Update settings to disable registration
+		$memorySource = new Memory();
+		$memorySource->set( 'member', 'registration_enabled', false );
+		$settings = new SettingManager( $memorySource );
+
+		$service = new RegistrationService(
+			$this->_userRepository,
+			$this->_passwordHasher,
+			$this->_verificationManager,
+			$settings,
+			$this->_emitter
+		);
+
+		$result = $service->isRegistrationEnabled();
+		$this->assertFalse( $result );
+	}
+
+	public function testRegisterWithValidData(): void
+	{
+		$username = 'newuser';
+		$email = 'newuser@example.com';
+		$password = 'SecurePass123';
+		$passwordConfirmation = 'SecurePass123';
+
+		// User repository checks should return null (user doesn't exist)
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByUsername' )
+			->with( $username )
+			->willReturn( null );
+
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByEmail' )
+			->with( $email )
+			->willReturn( null );
+
+		// Expect user to be created
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'create' )
+			->with( $this->callback( function( $user ) use ( $username, $email ) {
+				return $user instanceof User &&
+				       $user->getUsername() === $username &&
+				       $user->getEmail() === $email &&
+				       $user->getRole() === User::ROLE_SUBSCRIBER &&
+				       $user->getStatus() === User::STATUS_INACTIVE &&
+				       !$user->isEmailVerified();
+			} ) )
+			->willReturnCallback( function( $user ) {
+				$user->setId( 1 );
+				return $user;
+			} );
+
+		// Expect verification email to be sent
+		$this->_verificationManager
+			->expects( $this->once() )
+			->method( 'sendVerificationEmail' );
+
+		// Register user
+		$user = $this->_service->register( $username, $email, $password, $passwordConfirmation );
+
+		$this->assertInstanceOf( User::class, $user );
+		$this->assertEquals( $username, $user->getUsername() );
+		$this->assertEquals( $email, $user->getEmail() );
+	}
+
+	public function testRegisterWhenDisabled(): void
+	{
+		// Update settings to disable registration
+		$memorySource = new Memory();
+		$memorySource->set( 'member', 'registration_enabled', false );
+		$settings = new SettingManager( $memorySource );
+
+		$service = new RegistrationService(
+			$this->_userRepository,
+			$this->_passwordHasher,
+			$this->_verificationManager,
+			$settings,
+			$this->_emitter
+		);
+
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'User registration is currently disabled' );
+
+		$service->register( 'user', 'user@example.com', 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithEmptyUsername(): void
+	{
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Username is required' );
+
+		$this->_service->register( '', 'user@example.com', 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithShortUsername(): void
+	{
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Username must be between 3 and 50 characters' );
+
+		$this->_service->register( 'ab', 'user@example.com', 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithLongUsername(): void
+	{
+		$longUsername = str_repeat( 'a', 51 );
+
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Username must be between 3 and 50 characters' );
+
+		$this->_service->register( $longUsername, 'user@example.com', 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithInvalidUsernameCharacters(): void
+	{
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Username can only contain letters, numbers, and underscores' );
+
+		$this->_service->register( 'user@name', 'user@example.com', 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithExistingUsername(): void
+	{
+		$username = 'existinguser';
+
+		// User repository finds existing user
+		$existingUser = new User();
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByUsername' )
+			->with( $username )
+			->willReturn( $existingUser );
+
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Username is already taken' );
+
+		$this->_service->register( $username, 'user@example.com', 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithInvalidEmail(): void
+	{
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Invalid email address' );
+
+		$this->_service->register( 'user', 'invalid-email', 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithExistingEmail(): void
+	{
+		$email = 'existing@example.com';
+
+		// Username check passes
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByUsername' )
+			->willReturn( null );
+
+		// Email check finds existing user
+		$existingUser = new User();
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'findByEmail' )
+			->with( $email )
+			->willReturn( $existingUser );
+
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Email is already registered' );
+
+		$this->_service->register( 'user', $email, 'Password123', 'Password123' );
+	}
+
+	public function testRegisterWithPasswordMismatch(): void
+	{
+		$this->expectException( \Exception::class );
+		$this->expectExceptionMessage( 'Passwords do not match' );
+
+		$this->_service->register( 'user', 'user@example.com', 'Password123', 'Different123' );
+	}
+
+	public function testRegisterWithWeakPassword(): void
+	{
+		$this->expectException( \Exception::class );
+
+		$this->_service->register( 'user', 'user@example.com', 'weak', 'weak' );
+	}
+
+	public function testRegisterWithoutEmailVerification(): void
+	{
+		// Update settings to not require email verification
+		$memorySource = new Memory();
+		$memorySource->set( 'member', 'registration_enabled', true );
+		$memorySource->set( 'member', 'require_email_verification', false );
+		$memorySource->set( 'member', 'default_role', User::ROLE_SUBSCRIBER );
+		$settings = new SettingManager( $memorySource );
+
+		$service = new RegistrationService(
+			$this->_userRepository,
+			$this->_passwordHasher,
+			$this->_verificationManager,
+			$settings,
+			$this->_emitter
+		);
+
+		// Username and email checks pass
+		$this->_userRepository
+			->method( 'findByUsername' )
+			->willReturn( null );
+		$this->_userRepository
+			->method( 'findByEmail' )
+			->willReturn( null );
+
+		// Expect user to be created as active
+		$this->_userRepository
+			->expects( $this->once() )
+			->method( 'create' )
+			->with( $this->callback( function( $user ) {
+				return $user instanceof User &&
+				       $user->getStatus() === User::STATUS_ACTIVE &&
+				       $user->isEmailVerified();
+			} ) )
+			->willReturnCallback( function( $user ) {
+				$user->setId( 1 );
+				return $user;
+			} );
+
+		// Verification email should NOT be sent
+		$this->_verificationManager
+			->expects( $this->never() )
+			->method( 'sendVerificationEmail' );
+
+		$user = $service->register( 'user', 'user@example.com', 'Password123', 'Password123' );
+
+		$this->assertTrue( $user->isEmailVerified() );
+		$this->assertEquals( User::STATUS_ACTIVE, $user->getStatus() );
+	}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index f31da16..67fcd41 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,4 +8,13 @@
 ini_set( 'display_errors', 1 );
 
 // Set timezone
-date_default_timezone_set( 'UTC' );
\ No newline at end of file
+date_default_timezone_set( 'UTC' );
+
+// Initialize ViewDataProvider for tests
+$provider = \Neuron\Mvc\Views\ViewDataProvider::getInstance();
+$provider->share( 'siteName', 'Test Site' );
+$provider->share( 'appVersion', '1.0.0-test' );
+$provider->share( 'currentUser', null );
+$provider->share( 'theme', 'sandstone' );
+$provider->share( 'currentYear', fn() => date('Y') );
+$provider->share( 'isAuthenticated', false );
\ No newline at end of file
diff --git a/versionlog.md b/versionlog.md
index 8301633..627d762 100644
--- a/versionlog.md
+++ b/versionlog.md
@@ -2,6 +2,9 @@
 
 * Large refactoring.
 * Updated to use the new ORM component.
+* Added user timezone support.
+* Renamed config.yaml to neuron.yaml
+
 
 ## 0.8.2 2025-11-11