diff --git a/pelicanconf.py b/pelicanconf.py
index 99ea5b5..efc2edd 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -1,19 +1,22 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*- #
 import datetime
-from os.path import join, dirname, abspath
+from pathlib import Path
 
-import repogen
-from pelican.plugins import webassets
 import pelican.themes.webosbrew
+from pelican.plugins import webassets
 from webassets.cache import MemoryCache
 
+import repogen
+
 AUTHOR = 'webOS Homebrew Project'
 SITENAME = 'webOS Homebrew Project'
 SITEURL = ''
 
 THEME = 'webosbrew'
-THEME_STATIC_PATHS = [join(dirname(abspath(__file__)), 'theme/static'), pelican.themes.webosbrew.static_dir()]
+theme_dir = Path(__file__, '..', 'theme').resolve()
+THEME_STATIC_PATHS = [theme_dir.joinpath('static'), pelican.themes.webosbrew.static_dir()]
+WEBASSETS_SOURCE_PATHS = [theme_dir.joinpath('styles'), pelican.themes.webosbrew.scss_dir()]
 THEME_TEMPLATES_OVERRIDES = ['./theme/templates']
 
 PLUGINS = [webassets, repogen]
diff --git a/requirements.txt b/requirements.txt
index 90492b8..96d9665 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,4 @@ invoke~=2.0.0
 ar~=0.3.2
 jsonschema~=4.17.3
 git+https://github.com/Kronuz/pyScss.git@60414f5d573315a8458b5fbcdf69e5c648c44a9a#egg=pyscss
-git+https://github.com/webosbrew/pelican-theme-webosbrew.git@v1.0.4#egg=pelican-theme-webosbrew
\ No newline at end of file
+git+https://github.com/webosbrew/pelican-theme-webosbrew.git@v1.0.9#egg=pelican-theme-webosbrew
\ No newline at end of file
diff --git a/theme/static/styles/app.scss b/theme/styles/app.scss
similarity index 100%
rename from theme/static/styles/app.scss
rename to theme/styles/app.scss
diff --git a/theme/static/styles/apps.scss b/theme/styles/apps.scss
similarity index 100%
rename from theme/static/styles/apps.scss
rename to theme/styles/apps.scss
diff --git a/theme/templates/app.html b/theme/templates/app.html
index 436ae1b..63a670c 100644
--- a/theme/templates/app.html
+++ b/theme/templates/app.html
@@ -5,7 +5,7 @@
 
 {% block head %}
   {{ super() }}
-  {% assets filters="pyscss,cssmin", output="styles/app.css", "styles/app.scss" %}
+  {% assets filters="pyscss,cssmin", output="styles/app.css", "app.scss" %}
   <link href="{{ SITEURL }}/{{ ASSET_URL }}" type="text/css" rel="stylesheet">
   {% endassets %}
 
diff --git a/theme/templates/apps.html b/theme/templates/apps.html
index 5fa143d..794bfdd 100644
--- a/theme/templates/apps.html
+++ b/theme/templates/apps.html
@@ -5,7 +5,7 @@
 
 {% block head %}
   {{ super() }}
-  {% assets filters="pyscss,cssmin", output="styles/apps.css", "styles/apps.scss" %}
+  {% assets filters="pyscss,cssmin", output="styles/apps.css", "apps.scss" %}
   <link href="{{ SITEURL }}/{{ ASSET_URL }}" type="text/css" rel="stylesheet">
   {% endassets %}