diff --git a/PKGBUILD b/PKGBUILD
index 8bf68a5..0184730 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=archcraft-openbox
 pkgver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Openbox Configurations for Archcraft"
 arch=('any')
 url="https://github.com/archcraft-os/archcraft-openbox"
diff --git a/files/themes/adaptive/apply.sh b/files/themes/adaptive/apply.sh
index 36ad470..db6ad7d 100755
--- a/files/themes/adaptive/apply.sh
+++ b/files/themes/adaptive/apply.sh
@@ -156,12 +156,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/beach/apply.sh b/files/themes/beach/apply.sh
index af98b87..206608e 100755
--- a/files/themes/beach/apply.sh
+++ b/files/themes/beach/apply.sh
@@ -148,12 +148,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/default/apply.sh b/files/themes/default/apply.sh
index af98b87..206608e 100755
--- a/files/themes/default/apply.sh
+++ b/files/themes/default/apply.sh
@@ -148,12 +148,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/easy/apply.sh b/files/themes/easy/apply.sh
index e8b071b..b5eeb40 100755
--- a/files/themes/easy/apply.sh
+++ b/files/themes/easy/apply.sh
@@ -153,12 +153,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/forest/apply.sh b/files/themes/forest/apply.sh
index af98b87..206608e 100755
--- a/files/themes/forest/apply.sh
+++ b/files/themes/forest/apply.sh
@@ -148,12 +148,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/hack/apply.sh b/files/themes/hack/apply.sh
index 7ead156..1d681a3 100755
--- a/files/themes/hack/apply.sh
+++ b/files/themes/hack/apply.sh
@@ -152,12 +152,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/manhattan/apply.sh b/files/themes/manhattan/apply.sh
index d39ba38..bf7a3da 100755
--- a/files/themes/manhattan/apply.sh
+++ b/files/themes/manhattan/apply.sh
@@ -148,12 +148,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/slime/apply.sh b/files/themes/slime/apply.sh
index 09f23de..5a4e3b5 100755
--- a/files/themes/slime/apply.sh
+++ b/files/themes/slime/apply.sh
@@ -148,12 +148,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/spark/apply.sh b/files/themes/spark/apply.sh
index 3866a70..10d5741 100755
--- a/files/themes/spark/apply.sh
+++ b/files/themes/spark/apply.sh
@@ -148,12 +148,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------
diff --git a/files/themes/wave/apply.sh b/files/themes/wave/apply.sh
index 835d2d9..6901efe 100755
--- a/files/themes/wave/apply.sh
+++ b/files/themes/wave/apply.sh
@@ -156,12 +156,11 @@ apply_terminal() {
 	_EOF_
 
 	# xfce terminal : fonts & colors
-	sed -i ${PATH_XFCE}/terminalrc \
-		-e "s/FontName=.*/FontName=$terminal_font_name $terminal_font_size/g" \
-		-e "s/ColorBackground=.*/ColorBackground=${background}/g" \
-		-e "s/ColorForeground=.*/ColorForeground=${foreground}/g" \
-		-e "s/ColorCursor=.*/ColorCursor=${foreground}/g" \
-		-e "s/ColorPalette=.*/ColorPalette=${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}/g"
+	xfconf-query -c xfce4-terminal -p /font-name -s "$terminal_font_name $terminal_font_size"
+	xfconf-query -c xfce4-terminal -p /color-background -s "$background"
+	xfconf-query -c xfce4-terminal -p /color-foreground -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-cursor -s "$foreground"
+	xfconf-query -c xfce4-terminal -p /color-palette -s "${color0};${color1};${color2};${color3};${color4};${color5};${color6};${color7};${color8};${color9};${color10};${color11};${color12};${color13};${color14};${color15}"
 }
 
 # Geany -------------------------------------