diff --git a/gui/Android.mk b/gui/Android.mk
index 4ad558a..0f20f16 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -51,14 +51,6 @@
 ifneq ($(TW_EXTERNAL_STORAGE_PATH),)
 	LOCAL_CFLAGS += -DTW_EXTERNAL_STORAGE_PATH=$(TW_EXTERNAL_STORAGE_PATH)
 endif
-ifneq ($(TW_BRIGHTNESS_PATH),)
-	LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH)
-endif
-ifneq ($(TW_MAX_BRIGHTNESS),)
-	LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=$(TW_MAX_BRIGHTNESS)
-else
-	LOCAL_CFLAGS += -DTW_MAX_BRIGHTNESS=255
-endif
 ifneq ($(TW_NO_SCREEN_BLANK),)
 	LOCAL_CFLAGS += -DTW_NO_SCREEN_BLANK
 endif
diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp
index c8d1bcc..383b157 100644
--- a/gui/blanktimer.cpp
+++ b/gui/blanktimer.cpp
@@ -117,7 +117,8 @@
 
 int blanktimer::getBrightness(void) {
 	string results;
-	string brightness_path = EXPAND(TW_BRIGHTNESS_PATH);
+	string brightness_path;
+	DataManager::GetValue("tw_brightness_file", brightness_path);
 	if ((TWFunc::read_file(brightness_path, results)) != 0)
 		return -1;
 	int result = atoi(results.c_str());
@@ -135,9 +136,10 @@
 }
 
 int blanktimer::setBrightness(int brightness) {
-	string brightness_path = EXPAND(TW_BRIGHTNESS_PATH);
+	string brightness_path;
 	string bstring;
 	char buff[100];
+	DataManager::GetValue("tw_brightness_file", brightness_path);
 	sprintf(buff, "%d", brightness);
 	bstring = buff;
 	if ((TWFunc::write_file(brightness_path, bstring)) != 0)