diff --git a/Makefile b/Makefile
index 3e99fd2..e52d58a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-HYDE?=	hyde.py
+HYDE?=	hyde
 TIDY?=	tidy -qe
 FIND?=	find
 ADDRESS?=	127.0.0.1
@@ -7,7 +7,7 @@ clean:
 	rm -fr deploy
 
 generate: clean
-	${HYDE} -g -s .
+	${HYDE} -s . gen
 
 validate: generate
 	@for html in `${FIND} deploy -name "*.html"|xargs`; do \
@@ -16,7 +16,7 @@ validate: generate
 	done
 
 serve: generate
-	${HYDE} -a ${ADDRESS} -w -k -s .
+	${HYDE} -s . serve -a ${ADDRESS}
 
 upload: generate
 	./upload.sh
diff --git a/content/.htaccess b/content/.htaccess
deleted file mode 100644
index c02394b..0000000
--- a/content/.htaccess
+++ /dev/null
@@ -1,15 +0,0 @@
-{% if GENERATE_CLEAN_URLS %}
-RewriteEngine on
-RewriteBase {{ node.site.settings.SITE_ROOT }}
-
-{% hyde_listing_page_rewrite_rules %}
-
-# listing pages whose names are the same as their enclosing folder's
-RewriteCond %{REQUEST_FILENAME}/$1.html -f 
-RewriteRule ^([^/]*)/$ %{REQUEST_FILENAME}/$1.html
-
-# regular pages
-RewriteCond %{REQUEST_FILENAME}.html -f
-RewriteRule ^.*$ %{REQUEST_FILENAME}.html
-
-{% endif %}
diff --git a/content/about/about.html b/content/about/about.html
index 6c16feb..4cfb6c1 100644
--- a/content/about/about.html
+++ b/content/about/about.html
@@ -1,7 +1,8 @@
-{% extends "_page.html" %}
-{%hyde
-    title: "About"
-%}
+---
+extends: _page.html
+title: About
+---
+
 {% block article %}
 
 # About
diff --git a/content/index.html b/content/index.html
index a4bddea..9489f9c 100644
--- a/content/index.html
+++ b/content/index.html
@@ -1,9 +1,7 @@
-{% extends "skeleton/_body.html" %}
-{%hyde
-    title: "Home"
-    created: 2009-02-01 18:09:05
-    listing: True
-%}
+---
+extends: skeleton/_body.html
+title: Home
+---
 
 {% block extra_js %}
   <script type="text/javascript"
diff --git a/media/css/base.css b/content/media/css/base.css
similarity index 100%
rename from media/css/base.css
rename to content/media/css/base.css
diff --git a/media/js/novel.js b/content/media/js/novel.js
similarity index 100%
rename from media/js/novel.js
rename to content/media/js/novel.js
diff --git a/content/projects/projects.html b/content/projects/projects.html
index 63d0076..085aa42 100644
--- a/content/projects/projects.html
+++ b/content/projects/projects.html
@@ -1,7 +1,8 @@
-{% extends "_page.html" %}
-{%hyde
-    title: "Projects"
-%}
+---
+extends: _page.html
+title: Projects
+---
+
 {% block article %}
 
 [TOC]
diff --git a/content/writings/writings.html b/content/writings/writings.html
index 7b2aa66..f0d4e79 100644
--- a/content/writings/writings.html
+++ b/content/writings/writings.html
@@ -1,7 +1,8 @@
-{% extends "_page.html" %}
-{%hyde
-    title: "Writings"
-%}
+---
+extends: _page.html
+title: Writings
+---
+
 {% block article %}
 
 Time to time I write about UNIX-like systems and software. I'm interested
diff --git a/layout/skeleton/_body.html b/layout/skeleton/_body.html
index 7f4cb81..189d362 100644
--- a/layout/skeleton/_body.html
+++ b/layout/skeleton/_body.html
@@ -1,5 +1,5 @@
 {% extends "skeleton/_base.html" %}
-{% block title %}{{site.name}} :: {{page.title}} {% endblock %}
+{% block title %}{{site.name}} :: {{resource.meta.title}} {% endblock %}
 {% block content %}
 {% block context_nav %}{% endblock %}
 {% block sitenav %}
diff --git a/settings.py b/settings.py
deleted file mode 100644
index 89f55ff..0000000
--- a/settings.py
+++ /dev/null
@@ -1,138 +0,0 @@
-import os
-
-ROOT_PATH = os.path.abspath(os.path.dirname(__file__))
-
-#Directories
-LAYOUT_DIR = os.path.join(ROOT_PATH, 'layout')
-CONTENT_DIR = os.path.join(ROOT_PATH, 'content')
-MEDIA_DIR = os.path.join(ROOT_PATH, 'media')
-DEPLOY_DIR = os.path.join(ROOT_PATH, 'deploy')
-TMP_DIR = os.path.join(ROOT_PATH, 'deploy_tmp')
-
-BACKUPS_DIR = os.path.join(ROOT_PATH, 'backups')
-BACKUP = False
-
-SITE_ROOT = "/"
-SITE_WWW_URL = "http://novel.evilcoder.org"
-SITE_NAME = "Roman Bogorodskiy"
-SITE_AUTHOR = "Roman Bogorodskiy"
-
-#Url Configuration
-GENERATE_ABSOLUTE_FS_URLS = False
-
-# Clean urls causes Hyde to generate urls without extensions. Examples:
-# http://example.com/section/page.html becomes
-# http://example.com/section/page/, and the listing for that section becomes
-# http://example.com/section/
-# The built-in CherryPy webserver is capable of serving pages with clean urls
-# without any additional configuration, but Apache will need to use Mod_Rewrite
-# to map the clean urls to the actual html files.  The HtaccessGenerator site
-# post processor is capable of automatically generating the necessary
-# RewriteRules for use with Apache.
-GENERATE_CLEAN_URLS = False
-
-# A list of filenames (without extensions) that will be considered listing
-# pages for their enclosing folders.
-# LISTING_PAGE_NAMES = ['index']
-LISTING_PAGE_NAMES = ['listing', 'index', 'default']
-
-# Determines whether or not to append a trailing slash to generated urls when
-# clean urls are enabled.
-APPEND_SLASH = False
-
-# {folder : extension : (processors)}
-# The processors are run in the given order and are chained.
-# Only a lone * is supported as an indicator for folders. Path 
-# should be specified. No wildcard card support yet.
- 
-# Starting under the media folder. For example, if you have media/css under 
-# your site root,you should specify just css. If you have media/css/ie you 
-# should specify css/ie for the folder name. css/* is not supported (yet).
-
-# Extensions do not support wildcards.
-
-MEDIA_PROCESSORS = {
-    '*':{
-        '.css':('hydeengine.media_processors.TemplateProcessor',
-                'hydeengine.media_processors.YUICompressor',),
-        '.ccss':('hydeengine.media_processors.TemplateProcessor',
-                'hydeengine.media_processors.CleverCSS',
-                'hydeengine.media_processors.YUICompressor',),
-        '.sass':('hydeengine.media_processors.TemplateProcessor',
-                'hydeengine.media_processors.SASS',
-                'hydeengine.media_processors.YUICompressor',),                
-        '.less':('hydeengine.media_processors.TemplateProcessor',
-                'hydeengine.media_processors.LessCSS',
-                'hydeengine.media_processors.YUICompressor',),                
-        '.hss':(
-                'hydeengine.media_processors.TemplateProcessor',
-                'hydeengine.media_processors.HSS',
-                'hydeengine.media_processors.YUICompressor',),
-        '.js':(
-                'hydeengine.media_processors.TemplateProcessor',
-                'hydeengine.media_processors.YUICompressor',)
-    } 
-}
-
-CONTENT_PROCESSORS = {
-    'prerendered/': {
-        '*.*' : 
-            ('hydeengine.content_processors.PassthroughProcessor',)
-            }
-}
-
-SITE_POST_PROCESSORS = {
-    # 'media/js': {
-    #        'hydeengine.site_post_processors.FolderFlattener' : {
-    #                'remove_processed_folders': True,
-    #                'pattern':"*.js"
-    #        }
-    #    }
-}
-
-CONTEXT = {
-    'GENERATE_CLEAN_URLS': GENERATE_CLEAN_URLS
-}
-
-FILTER = { 
-    'include': (".htaccess",),
-    'exclude': (".*","*~")
-}        
-
-
-MD_EXTENSIONS = ['toc']
-
-#Processor Configuration 
-
-# 
-#  Set this to the output of `which growlnotify`. If `which`  returns emtpy,
-#  install growlnotify from the Extras package that comes with the Growl disk image.
-# 
-#
-GROWL = None
-
-# path for YUICompressor, or None if you don't
-# want to compress JS/CSS. Project homepage:
-# http://developer.yahoo.com/yui/compressor/
-#YUI_COMPRESSOR = "./lib/yuicompressor-2.4.2.jar"
-YUI_COMPRESSOR = None 
-
-# path for Closure Compiler, or None if you don't
-# want to compress JS/CSS. Project homepage:
-# http://closure-compiler.googlecode.com/
-#CLOSURE_COMPILER = "./lib/compiler.jar"
-CLOSURE_COMPRILER = None 
-
-# path for HSS, which is a preprocessor for CSS-like files (*.hss)
-# project page at http://ncannasse.fr/projects/hss
-#HSS_PATH = "./lib/hss-1.0-osx"
-HSS_PATH = None # if you don't want to use HSS
-
-#Django settings
-
-TEMPLATE_DIRS = (LAYOUT_DIR, CONTENT_DIR, TMP_DIR, MEDIA_DIR)
-
-INSTALLED_APPS = (
-    'hydeengine',
-    'django.contrib.webdesign',
-)
diff --git a/site.yaml b/site.yaml
new file mode 100644
index 0000000..71b4592
--- /dev/null
+++ b/site.yaml
@@ -0,0 +1,16 @@
+mode: development
+media_root: media
+media_url: /media
+base_url: /
+plugins:
+    - hyde.ext.plugins.meta.MetaPlugin
+    - hyde.ext.plugins.meta.AutoExtendPlugin
+    - hyde.ext.plugins.meta.SorterPlugin
+    - hyde.ext.plugins.meta.TaggerPlugin
+    - hyde.ext.plugins.text.SyntextPlugin
+    - hyde.ext.plugins.text.TextlinksPlugin
+
+context:
+    data:
+        site:
+            name: Roman Bogorodskiy