Index: src/diff.tcl
==================================================================
--- src/diff.tcl
+++ src/diff.tcl
@@ -228,13 +228,17 @@
 
 wm withdraw .
 wm title . $CFG(TITLE)
 wm iconname . $CFG(TITLE)
 bind . <q> exit
+bind . <Escape><Escape> exit
 bind . <Destroy> {after 0 exit}
 bind . <Tab> {cycleDiffs; break}
 bind . <<PrevWindow>> {cycleDiffs 1; break}
+bind . <n> {catch {searchNext -forwards +1 1.0 end}; break}
+bind . <p> {catch {searchNext -backwards -1 end 1.0}; break}
+bind . <Control-f> {searchOnOff; break}
 bind . <Return> {
   event generate .bb.files <1>
   event generate .bb.files <ButtonRelease-1>
   break
 }
@@ -259,10 +263,14 @@
   bind . <Shift-$key> continue
 }
 
 frame .bb
 ::ttk::menubutton .bb.files -text "Files"
+if {[tk windowingsystem] eq "win32"} {
+  ::ttk::style theme use winnative
+  .bb.files configure -padding {20 1 10 2}
+}
 toplevel .wfiles
 wm withdraw .wfiles
 update idletasks
 wm transient .wfiles .
 wm overrideredirect .wfiles 1
@@ -358,17 +366,19 @@
     grid config .txtB -column 1
     .txtB tag config add -background $CFG(RM_BG)
     grid config .lnA -column 3
     grid config .txtA -column 4
     .txtA tag config rm -background $CFG(ADD_BG)
+    .bb.invert config -text {= Invert =}
   } else {
     grid config .lnA -column 0
     grid config .txtA -column 1
     .txtA tag config rm -background $CFG(RM_BG)
     grid config .lnB -column 3
     grid config .txtB -column 4
     .txtB tag config add -background $CFG(ADD_BG)
+    .bb.invert config -text {Invert}
   }
   .mkr config -state normal
   set clt [.mkr search -all < 1.0 end]
   set cgt [.mkr search -all > 1.0 end]
   foreach c $clt {.mkr replace $c "$c +1 chars" >}
@@ -385,13 +395,13 @@
     set ::search .txtA
     if {![winfo exists .bb.sframe]} {
       frame .bb.sframe
       ::ttk::entry .bb.sframe.e -width 10
       pack .bb.sframe.e -side left -fill y -expand 1
-      ::ttk::button .bb.sframe.nx -text \u2193 -width 1 \
+      ::ttk::button .bb.sframe.nx -text \u2193 -width 3 \
           -command {searchNext -forwards +1 1.0 end}
-      ::ttk::button .bb.sframe.pv -text \u2191 -width 1 \
+      ::ttk::button .bb.sframe.pv -text \u2191 -width 3 \
           -command {searchNext -backwards -1 end 1.0}
       tk_optionMenu .bb.sframe.typ ::search_type \
            Exact {No Case} {RegExp} {Whole Word}
       .bb.sframe.typ config -width 10
       set ::search_type Exact