diff --git a/demos/assets/dark/inc/styles/system_bar.data b/demos/assets/dark/inc/styles/system_bar.data
index 3079e1ca8..668bc9b27 100644
--- a/demos/assets/dark/inc/styles/system_bar.data
+++ b/demos/assets/dark/inc/styles/system_bar.data
@@ -44,7 +44,7 @@ TK_CONST_DATA_ALIGN(const unsigned char style_system_bar[]) = {
 0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
 0x01,0x00,0x00,0x00,0x74,0x65,0x78,0x74,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0xff,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x69,0x63,0x6f,0x6e,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x63,0x6c,0x6f,0x73,0x65,0x5f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/demos/assets/dark/raw/styles/system_bar.bin b/demos/assets/dark/raw/styles/system_bar.bin
index bb963523a..5b4340e2a 100644
Binary files a/demos/assets/dark/raw/styles/system_bar.bin and b/demos/assets/dark/raw/styles/system_bar.bin differ
diff --git a/demos/assets/dark/raw/styles/system_bar.xml b/demos/assets/dark/raw/styles/system_bar.xml
index 4320c054c..9fea95f27 100644
--- a/demos/assets/dark/raw/styles/system_bar.xml
+++ b/demos/assets/dark/raw/styles/system_bar.xml
@@ -12,7 +12,7 @@
 
 <digit_clock>
   <style name="time">
-    <normal text_color="white" />
+    <normal text_color="green" />
   </style>
 </digit_clock>
 
diff --git a/demos/assets/default/inc/strings/en_US.bin b/demos/assets/default/raw/strings/en_US.bin
similarity index 100%
rename from demos/assets/default/inc/strings/en_US.bin
rename to demos/assets/default/raw/strings/en_US.bin
diff --git a/demos/assets/default/inc/strings/zh_CN.bin b/demos/assets/default/raw/strings/zh_CN.bin
similarity index 100%
rename from demos/assets/default/inc/strings/zh_CN.bin
rename to demos/assets/default/raw/strings/zh_CN.bin
diff --git a/scripts/update_res_common.py b/scripts/update_res_common.py
index 29dfb749d..929d5fd72 100755
--- a/scripts/update_res_common.py
+++ b/scripts/update_res_common.py
@@ -95,7 +95,7 @@ def themegen(raw, inc):
 
 def themegen_bin(raw, bin):
     input=joinPath(INPUT_DIR, raw)
-    output=joinPath(OUTPUT_DIR, bin)
+    output=joinPath(INPUT_DIR, bin)
     if(os.path.isfile(input)):
         execCmd(toExe('themegen') + ' ' + input + ' ' + output + ' bin')
 
@@ -109,7 +109,7 @@ def strgen(raw, inc):
 
 def strgen_bin(raw, bin):
     input=joinPath(INPUT_DIR, raw)
-    output=joinPath(OUTPUT_DIR, bin)
+    output=joinPath(INPUT_DIR, bin)
     if(os.path.isfile(input)):
         execCmd(toExe('strgen') + ' ' + input + ' ' + output + ' bin')
 
diff --git a/tests/font_gen_test.cc b/tests/font_gen_test.cc
index 63fc33493..331a32855 100644
--- a/tests/font_gen_test.cc
+++ b/tests/font_gen_test.cc
@@ -12,7 +12,7 @@
 #include <string>
 using std::string;
 
-#define TTF_FILE TK_ROOT "/tests/testdata/assets/raw/fonts/starthere.ttf"
+#define TTF_FILE TK_ROOT "/tests/testdata/assets/default/raw/fonts/starthere.ttf"
 #define BUFF_SIZE 1024 * 1024
 
 TEST(FontGen, basic) {
diff --git a/tests/image_manager_test.cc b/tests/image_manager_test.cc
index a9689507f..fa0ca15f9 100644
--- a/tests/image_manager_test.cc
+++ b/tests/image_manager_test.cc
@@ -82,7 +82,7 @@ TEST(ImageManager, locale) {
 #ifdef WITH_FS_RES
 TEST(ImageManager, fs) {
   bitmap_t bmp;
-  const char* filename = "file://./demos/assets/raw/images/xx/flag_CN.png";
+  const char* filename = "file://./demos/assets/default/raw/images/xx/flag_CN.png";
 
   memset(&bmp, 0x00, sizeof(bmp));
   ASSERT_EQ(image_manager_get_bitmap(image_manager(), filename, &bmp), RET_OK);
diff --git a/tests/testdata/assets/raw/fonts/disney.ttf b/tests/testdata/assets/default/raw/fonts/disney.ttf
similarity index 100%
rename from tests/testdata/assets/raw/fonts/disney.ttf
rename to tests/testdata/assets/default/raw/fonts/disney.ttf
diff --git a/tests/testdata/assets/raw/fonts/starthere.ttf b/tests/testdata/assets/default/raw/fonts/starthere.ttf
similarity index 100%
rename from tests/testdata/assets/raw/fonts/starthere.ttf
rename to tests/testdata/assets/default/raw/fonts/starthere.ttf
diff --git a/tests/testdata/assets/raw/images/x1/locale1_en_US.png b/tests/testdata/assets/default/raw/images/x1/locale1_en_US.png
similarity index 100%
rename from tests/testdata/assets/raw/images/x1/locale1_en_US.png
rename to tests/testdata/assets/default/raw/images/x1/locale1_en_US.png
diff --git a/tests/testdata/assets/raw/images/x1/locale_en.png b/tests/testdata/assets/default/raw/images/x1/locale_en.png
similarity index 100%
rename from tests/testdata/assets/raw/images/x1/locale_en.png
rename to tests/testdata/assets/default/raw/images/x1/locale_en.png
diff --git a/tests/testdata/assets/raw/images/x2/locale1_en_US.png b/tests/testdata/assets/default/raw/images/x2/locale1_en_US.png
similarity index 100%
rename from tests/testdata/assets/raw/images/x2/locale1_en_US.png
rename to tests/testdata/assets/default/raw/images/x2/locale1_en_US.png
diff --git a/tests/testdata/assets/raw/images/x2/locale_en.png b/tests/testdata/assets/default/raw/images/x2/locale_en.png
similarity index 100%
rename from tests/testdata/assets/raw/images/x2/locale_en.png
rename to tests/testdata/assets/default/raw/images/x2/locale_en.png