diff --git a/site/themes/default/settings.json b/site/themes/default/settings.json
deleted file mode 100755
index 4e609c71..00000000
--- a/site/themes/default/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "enabled": true
-}
diff --git a/site/themes/default/settings.yaml b/site/themes/default/settings.yaml
new file mode 100755
index 00000000..d4ca9418
--- /dev/null
+++ b/site/themes/default/settings.yaml
@@ -0,0 +1 @@
+enabled: true
diff --git a/site/themes/default/theme.json b/site/themes/default/theme.json
deleted file mode 100755
index 6a78bd76..00000000
--- a/site/themes/default/theme.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "Default",
-  "version": "1.0.0",
-  "description": "Default theme for Flextype",
-  "author": {
-    "name": "Sergey Romanenko",
-    "email": "hello@romanenko.digital",
-    "url": "http://romanenko.digital"
-  },
-  "homepage": "https://github.com/flextype/flextype",
-  "bugs": "https://github.com/flextype/flextype/issues",
-  "license": "MIT"
-}
diff --git a/site/themes/default/theme.yaml b/site/themes/default/theme.yaml
new file mode 100755
index 00000000..15b616d5
--- /dev/null
+++ b/site/themes/default/theme.yaml
@@ -0,0 +1,10 @@
+name: Default
+version: 1.0.0
+description: Default theme for Flextype
+author:
+  name: Sergey Romanenko
+  email: hello@romanenko.digital
+  url: http://romanenko.digital
+homepage: https://github.com/flextype/flextype
+bugs: https://github.com/flextype/flextype/issues
+license: MIT