diff --git a/.gitconfig b/.gitconfig
index 8f5b1cd..3526032 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -25,7 +25,7 @@
 [push]
 	default = upstream
 [merge]
-	tool = diffuse
+	tool = meld
 [mergetool]
 	keepBackup = false
 [core]
diff --git a/xfce4-terminalrc b/xfce4-terminalrc
index 54d40f0..c284c35 100644
--- a/xfce4-terminalrc
+++ b/xfce4-terminalrc
@@ -2,8 +2,7 @@
 ColorForeground=#e868e60ae60a
 ColorBackground=#1ce71ce71ce7
 ColorCursor=#486bc1ee0000
-ColorSelection=#1d8d39865034
-ColorSelectionUseDefault=FALSE
+ColorSelection=#fcfcafaf3e3e
 FontName=Consolas 11
 MiscAlwaysShowTabs=FALSE
 MiscBell=FALSE
@@ -25,5 +24,16 @@ MiscScrollAlternateScreen=TRUE
 ScrollingOnOutput=FALSE
 TabActivityColor=#cb4675241ed0
 ScrollingLines=10000
-ColorPalette=#000000000000;#c0c374e974e9;#6d09b6846d09;#bfe1bfff59ce;#9cc5b3c7f8cc;#bc2d7c84c7ad;#9c71e38de38d;#c760c501c501;#555555555555;#e631a631a631;#8bdaca0d8bda;#dc71dc71788b;#8b208b20dc71;#e90f9c71e90f;#7e03dcd3dcd3;#ffffffffffff
+ColorPalette=rgb(0,0,0);rgb(192,116,116);rgb(109,182,109);rgb(191,191,89);rgb(156,179,248);rgb(187,124,199);rgb(156,227,227);rgb(199,196,196);rgb(85,85,85);rgb(196,108,108);rgb(139,201,139);rgb(220,220,120);rgb(139,139,220);rgb(232,156,232);rgb(126,220,220);rgb(255,255,255)
+MiscBellUrgent=FALSE
+MiscMouseWheelZoom=TRUE
+MiscMiddleClickOpensUri=FALSE
+MiscCopyOnSelect=FALSE
+MiscShowRelaunchDialog=TRUE
+MiscRewrapOnResize=TRUE
+MiscUseShiftArrowsToScroll=FALSE
+MiscSlimTabs=FALSE
+MiscNewTabAdjacent=FALSE
+ColorSelectionBackground=#1d8d39865034
+ColorSelectionUseDefault=FALSE