diff --git a/bin/colorizer-conky b/bin/colorizer-conky
index b3ab85d..4bda73e 100755
--- a/bin/colorizer-conky
+++ b/bin/colorizer-conky
@@ -382,7 +382,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
out2+=(" $INCREASE $((FONTSIZE+1)) px,conkyctl basefont_inc_all;$me")
out2+=(" $DECREASE $((FONTSIZE-1)) px,conkyctl basefont_dec_all;$me")
out2+=("^sep()")
- sizes=(14 13 12 11 10 9 8 7 6)
+ sizes=(12 11 10 9 8)
for i in "${sizes[@]}"
do
[[ "$FONTSIZE" == "$i" ]] && out2+=("綠 $i px,conkyctl basefont_size_all $i;$me") || out2+=("祿 $i px,conkyctl basefont_size_all $i;$me")
@@ -417,7 +417,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
out2+=("^sep($_BORDER_WIDTH)")
[[ "${BWIDTH}" == "1" ]] && out2+=("綠 1 px ${_OLD_STYLE}") || out2+=("祿 1 px ${_OLD_STYLE},conkyctl border_width_all 1")
- for i in 2 4 6 8 10 12;do
+ for i in 2 4 6 8 10;do
[[ "${BWIDTH}" == "${i}" ]] && out2+=("綠 ${i} px") || out2+=("祿 ${i} px,conkyctl border_width_all ${i}")
done
diff --git a/bin/conkyctl b/bin/conkyctl
index 98f07e5..faa261a 100755
--- a/bin/conkyctl
+++ b/bin/conkyctl
@@ -60,7 +60,7 @@ border_width () {
imargin=8
else
omargin=$((${1} / 2 ))
- imargin=$((16 - $omargin))
+ imargin=$((10 - $omargin))
fi
#notify-send.sh "Margins" "outer = ${omargin}, inner = ${imargin}"
sd "border_outer_margin.*$" "border_outer_margin = ${omargin}," ${2}
@@ -73,7 +73,7 @@ border_width_all () {
imargin=8
else
omargin=$((${1} / 2 ))
- imargin=$((16 - $omargin))
+ imargin=$((10 - $omargin))
fi
sd "border_outer_margin.*$" "border_outer_margin = ${omargin}," ${CONKYDIR}/*mbcolor.conkyrc
sd "border_inner_margin.*$" "border_inner_margin = ${imargin}," ${CONKYDIR}/*mbcolor.conkyrc
@@ -1045,7 +1045,7 @@ if [[ "$FONT" != "" ]];then
out2+=(" $INCREASE $((FONTSIZE+1)) px,conkyctl basefont_inc ${1};$me")
out2+=(" $DECREASE $((FONTSIZE-1)) px,conkyctl basefont_dec ${1};$me")
out2+=("^sep()")
- sizes=(14 13 12 11 10 9 8 7 6)
+ sizes=(12 11 10 9 8 )
for i in "${sizes[@]}"
do
[[ "$FONTSIZE" == "$i" ]] && out2+=("綠 $i px,conkyctl basefont_size ${1} $i;$me") || out2+=("祿 $i px,conkyctl basefont_size ${1} $i;$me")
@@ -1080,7 +1080,7 @@ if [[ "$FONT" != "" ]];then
[[ "$BORD" == false ]] && out2+=("綠 $NO,conkyctl draw_borders true ${1};$me") || out2+=("祿 $NO,conkyctl draw_borders false ${1};$me")
out2+=("^sep($_BORDER_WIDTH)")
[[ "${BWIDTH}" == "1" ]] && out2+=("綠 1 px ${_OLD_STYLE}") || out2+=("祿 1 px ${_OLD_STYLE},conkyctl border_width 1 ${1}")
- for i in 2 4 6 8 10 12;do
+ for i in 2 4 6 8 10;do
[[ "${BWIDTH}" == "${i}" ]] && out2+=("綠 ${i} px") || out2+=("祿 ${i} px,conkyctl border_width ${i} ${1}")
done
out2+=("^sep($STIPPLED_BORDERS ?)")
diff --git a/share/mabox-colorizer/colorschemes/conky.csv b/share/mabox-colorizer/colorschemes/conky.csv
index d51dbb6..0004dcb 100644
--- a/share/mabox-colorizer/colorschemes/conky.csv
+++ b/share/mabox-colorizer/colorschemes/conky.csv
@@ -1,9 +1,9 @@
WINCLR | CLR | CLR0 | CLR1 | CLR2 | CLR3 |WINTRANS|OUTLINE|SHADES | BORD |BWIDTH| STIP |scheme_name
-#142c2c|#F8F8FF|#accdc7|#309552|#E8CB2D|#61c4bc|false|false|false|true|2|0|Istredd default
-#282936|#626483|#e9e9f4|#ea51b2|#ebff87|#00f769|false|false|true|true|8|0|Dracula
-#282828|#665C54|#ebdbb2|#98971a|#FB4934|#d79921|false|false|true|true|8|0|Gruvbox Dark
-#2D2A2E|#272822|#AB9DF2|#FCFCFA|#A6E22E|#78DCE8|false|false|false|true|8|0|Monokai Pro
-#2E3440|#4C566A|#B48EAD|#D8DEE9|#EBCB8B|#88C0D0|false|false|true|true|8|0|Nord
+#142c2c|#F8F8FF|#accdc7|#309552|#E8CB2D|#61c4bc|false|false|true|true|2|0|Istredd default
+#282936|#626483|#e9e9f4|#ea51b2|#ebff87|#00f769|false|false|true|true|4|0|Dracula
+#282828|#665C54|#ebdbb2|#98971a|#FB4934|#d79921|false|false|true|true|4|0|Gruvbox Dark
+#2D2A2E|#272822|#AB9DF2|#FCFCFA|#A6E22E|#78DCE8|false|false|false|true|6|0|Monokai Pro
+#2E3440|#4C566A|#B48EAD|#D8DEE9|#EBCB8B|#88C0D0|false|false|true|true|4|0|Nord
#f8f8f8|#F8F8FF|#181415|#282828|#e95620|#0e8420|true|false|true|false|2|0|transparent DarkTxt
#1b1b1b|#F8F8FF|#bbc8c8|#f2f2f2|#ebc13d|#84c747|true|false|false|false|2|0|transparent WhiteTxt
#184956|#2D5B69|#adbcbc|#ff665c|#ebc13d|#84c747|false|false|true|true|6|0|Selenized Dark
diff --git a/share/mabox-colorizer/fonts.list b/share/mabox-colorizer/fonts.list
index c4549e0..99b0561 100644
--- a/share/mabox-colorizer/fonts.list
+++ b/share/mabox-colorizer/fonts.list
@@ -1,6 +1,5 @@
# Put your favorite fonts families here, one per line
Autour One
-Cantarell
DejaVu Serif
Droid Sans
JetBrains Mono