2 files changed, 58 insertions, 92 deletions
diff --git a/X/.Xresources b/X/.Xresources
deleted file mode 100644
index e3ee918..0000000
--- a/X/.Xresources
+++ /dev/null
@@ -1,92 +0,0 @@
-XTerm*faceName:  Dina
-UXTerm*faceName: scientifica
-
-XTerm*faceSize:  8
-UXTerm*faceSize: 16
-
-*termName: xterm-256color
-
-
-XTerm*allowBoldFont: false
-UXTerm*allowBoldFont: false
-XTerm*boldMode: false
-UXTerm*boldMode: false
-
-XTerm*colorBDMode: true
-UXTerm*colorBDMode: true
-
-*VT100*translations: #override Shift <Btn1Up>: exec-formatted("firefox '%t'", PRIMARY)
-XTerm*on3Clicks: regex ([[:alpha:]]+://)?([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!! COLORS (serious business) !!!!!!!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!*background:  rgb:00/00/00
-!*foreground:  rgb:a8/a8/a8
-!
-!! Black
-!*color0:      rgb:00/00/00
-!*color8:      rgb:54/50/54
-!
-!! Red
-!*color1:      rgb:a8/00/00
-!*color9:      rgb:f8/54/50
-!
-!! Green
-!*color2:      rgb:00/a8/00
-!*color10:     rgb:50/fc/50
-!
-!! Yellow
-!*color3:      rgb:a8/54/00
-!*color11:     rgb:f8/fc/50
-!
-!! Blue
-!*color4:      rgb:00/00/a8
-!*color12:     rgb:50/54/f8
-!
-!! Magneta
-!*color5:      rgb:a8/00/a8
-!*color13:     rgb:f8/54/f8
-!
-!! Cyan
-!*color6:      rgb:00/a8/a8
-!*color14:     rgb:50/fc/f8
-!
-!! White
-!*color7:      rgb:a8/a8/a8
-!*color15:     rgb:f8/fc/f8
-
-! PaperColor Theme
-*.foreground: #4D4D4C
-*.background: #EEEEEE
-
-! black
-*.color0: #EDEDED
-*.color8: #969694
-
-! red
-*.color1: #D7005F
-*.color9: #D7005F
-
-! green
-*.color2: #718C00
-*.color10: #718C00
-
-! yellow / orange
-*.color3: #D75F00
-*.color11: #D75F00
-
-! blue
-*.color4: #4271AE
-*.color12: #4271AE
-
-! magenta
-*.color5: #8959A8
-*.color13: #8959A8
-
-! cyan
-*.color6: #3E999F
-*.color14: #3E999F
-
-! white
-*.color7: #4D4D4C
-*.color15: #F5F5F5
diff --git a/X/Xresources.m4 b/X/Xresources.m4
new file mode 100644
index 0000000..f80723a
--- /dev/null
+++ b/X/Xresources.m4
@@ -0,0 +1,58 @@
+include(m4_defaults.m4)
+Xft.dpi: EVANS_DISPLAY_DPI
+XTerm*faceName:  EVANS_TERM_FONT
+UXTerm*faceName: EVANS_TERM_FONT
+
+XTerm*faceSize:  EVANS_TERM_FONT_SIZE
+UXTerm*faceSize: EVANS_TERM_FONT_SIZE
+
+*termName: xterm-256color
+
+XTerm*allowBoldFont: false
+UXTerm*allowBoldFont: false
+XTerm*boldMode: false
+UXTerm*boldMode: false
+
+XTerm*colorBDMode: true
+UXTerm*colorBDMode: true
+
+*VT100*translations: #override Shift <Btn1Up>: exec-formatted("firefox '%t'", PRIMARY)
+XTerm*on3Clicks: regex ([[:alpha:]]+://)?([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!! COLORS (serious business) !!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+*.foreground: FOREGROUND
+*.background: BACKGROUND
+
+! black
+*.color0: BLACK
+*.color8: BLACK_BOLD
+
+! red
+*.color1: RED
+*.color9: RED_BOLD
+
+! green
+*.color2: GREEN
+*.color10: GREEN_BOLD
+
+! yellow / orange
+*.color3: YELLOW
+*.color11: YELLOW_BOLD
+
+! blue
+*.color4: BLUE
+*.color12: BLUE_BOLD
+
+! magenta
+*.color5: MAGENTA
+*.color13: MAGENTA_BOLD
+
+! cyan
+*.color6: CYAN
+*.color14: CYAN_BOLD
+
+! white
+*.color7: WHITE
+*.color15: WHITE_BOLD