Index: src/org/apache/lucene/luke/ui/DocumentsTab.java
===================================================================
--- src/org/apache/lucene/luke/ui/DocumentsTab.java	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/DocumentsTab.java	(working copy)
@@ -66,7 +66,7 @@
 import org.apache.pivot.wtk.TextInput;
 
 public class DocumentsTab extends TablePane implements Bindable {
-  
+
   private int iNum;
   @BXML
   private TableView docTable;
@@ -90,17 +90,17 @@
   private Label docNum2;
   @BXML
   private TextArea decText;
-  
+
   private java.util.List<String> fieldNames = null;
-  
+
   // this gets injected by LukeWindow at init
   private LukeMediator lukeMediator;
-  
+
   private Resources resources;
-  
+
   private TermsEnum te;
   private DocsAndPositionsEnum td;
-  
+
   private String fld;
   private Term lastTerm;
   private IndexReader ir;
@@ -108,8 +108,9 @@
   private java.util.List<String> indexFields;
   private IndexInfo idxInfo;
   private FieldInfos infos;
-  
+
   public DocumentsTab() {
+
     Action.getNamedActions().put("nextDoc", new Action() {
       @Override
       public void perform(Component component) {
@@ -131,7 +132,7 @@
     Action.getNamedActions().put("deleteTermDoc", new Action() {
       @Override
       public void perform(Component component) {
-    
+
       }
     });
     Action.getNamedActions().put("showFirstTerm", new Action() {
@@ -155,7 +156,7 @@
     Action.getNamedActions().put("showAllTermDoc", new Action() {
       @Override
       public void perform(Component component) {
-       
+
       }
     });
     Action.getNamedActions().put("showNextTermDoc", new Action() {
@@ -167,22 +168,21 @@
     Action.getNamedActions().put("showPositions", new Action() {
       @Override
       public void perform(Component component) {
-       
+
       }
     });
-    
+
   }
-  
+
   @Override
-  public void initialize(Map<String,Object> namespace, URL location,
-      Resources resources) {
+  public void initialize(Map<String,Object> namespace, URL location, Resources resources) {
     this.resources = resources;
   }
-  
+
   public void initLukeMediator(LukeMediator lukeMediator) {
     this.lukeMediator = lukeMediator;
   }
-  
+
   /**
    * Initialize GUI elements. This method is called when a new index is opened.
    * 
@@ -191,26 +191,24 @@
   public void onOpenIndex() throws Exception {
     this.idxInfo = lukeMediator.getIndexInfo();
     this.ir = idxInfo.getReader();
-    
     if (ir instanceof CompositeReader) {
-      ar = new SlowCompositeReaderWrapper((CompositeReader)ir);
+      ar = new SlowCompositeReaderWrapper((CompositeReader) ir);
     } else if (ir instanceof AtomicReader) {
-      ar = (AtomicReader)ir;
+      ar = (AtomicReader) ir;
     }
-    
+
     if (ar != null) {
       infos = ar.getFieldInfos();
     }
-    
+
     this.indexFields = idxInfo.getFieldNames();
-  
-    
+
     List<String> fields = new ArrayList<String>(indexFields.size());
     for (String s : indexFields) {
       fields.add(s);
     }
     fieldsList.setListData(fields);
- 
+
     fieldNames = idxInfo.getFieldNames();
     if (fieldNames.size() == 0) {
       // TODO:
@@ -220,7 +218,7 @@
     }
     maxDocs.setText(String.valueOf(ir.maxDoc() - 1));
   }
-  
+
   private void showDoc(int incr) {
     if (ir == null) {
       // showStatus(resources.get("documentsTab_noOrClosedIndex"));
@@ -228,9 +226,10 @@
       System.out.println(resources.get("documentsTab_noOrClosedIndex"));
       return;
     }
-    
+
     String num = docNum.getText();
-    if (num.trim().equals("")) num = String.valueOf(-incr);
+    if (num.trim().equals(""))
+      num = String.valueOf(-incr);
     try {
       iNum = Integer.parseInt(num);
       iNum += incr;
@@ -241,11 +240,11 @@
         return;
       }
       docNum.setText(String.valueOf(iNum));
-      
+
       org.apache.lucene.util.Bits live = ar.getLiveDocs();
       if (live == null || live.get(iNum)) {
         Task<Object> populateTableTask = new Task<Object>() {
-          
+
           @Override
           public Object execute() throws TaskExecutionException {
             return null;
@@ -263,18 +262,18 @@
               // showStatus(e.getMessage());
             }
           }
-          
+
           @Override
           public void executeFailed(Task<Object> task) {
-            
+
           }
         };
         populateTableTask.execute(new TaskAdapter<Object>(tl));
-        
+
       } else {
 
         Task<Object> populateTableTask = new Task<Object>() {
-          
+
           @Override
           public Object execute() throws TaskExecutionException {
             return null;
@@ -283,19 +282,18 @@
         TaskListener<Object> tl = new TaskListener<Object>() {
           @Override
           public void taskExecuted(Task<Object> task) {
-            
+
             // TODO:
             // showStatus("Deleted document - not available.");
             popTableWithDoc(iNum, null);
           }
-          
+
           @Override
           public void executeFailed(Task<Object> task) {
-            
+
           }
         };
         populateTableTask.execute(new TaskAdapter<Object>(tl));
-        
 
       }
     } catch (Exception e) {
@@ -304,15 +302,15 @@
       // showStatus(e.getMessage());
     }
   }
-  
+
   private void nextDoc() {
     showDoc(1);
   }
-  
+
   private void prevDoc() {
     showDoc(-1);
   }
-  
+
   public void popTableWithDoc(int docid, Document doc) {
     docNum.setText(String.valueOf(docid));
     List<Map<String,String>> tableData = new ArrayList<Map<String,String>>();
@@ -328,7 +326,7 @@
     docNum2.setText(String.valueOf(docid));
     for (int i = 0; i < indexFields.size(); i++) {
       Map<String,String> row = new HashMap<String,String>();
-      
+
       IndexableField[] fields = doc.getFields(indexFields.get(i));
       if (fields == null) {
         tableData.add(row);
@@ -345,23 +343,22 @@
       }
     }
   }
-  
-  private void addFieldRow(Map<String,String> row, String fName, IndexableField field,
-      int docid) {
+
+  private void addFieldRow(Map<String,String> row, String fName, IndexableField field, int docid) {
     java.util.Map<String,Decoder> decoders = lukeMediator.getDecoders();
     Decoder defDecoder = lukeMediator.getDefDecoder();
-    
+
     Field f = (Field) field;
     // putProperty(row, "field", f);
     // putProperty(row, "fName", fName);
-    
+
     row.put("field", fName);
     row.put("itsvopfolb", Util.fieldFlags(f));
-    
+
     // if (f == null) {
     // setBoolean(cell, "enabled", false);
     // }
-    
+
     if (f != null) {
       try {
         FieldInfo info = infos.fieldInfo(fName);
@@ -380,7 +377,7 @@
       row.put("norm", "---");
       // setBoolean(cell, "enabled", false);
     }
-    
+
     if (f != null) {
       String text = f.stringValue();
       if (text == null) {
@@ -391,7 +388,8 @@
         }
       }
       Decoder dec = decoders.get(f.name());
-      if (dec == null) dec = defDecoder;
+      if (dec == null)
+        dec = defDecoder;
       try {
         if (f.fieldType().stored()) {
           text = dec.decodeStored(f.name(), f);
@@ -408,7 +406,7 @@
       // setBoolean(cell, "enabled", false);
     }
   }
-  
+
   public void showFirstTerm() {
     if (ir == null) {
       // TODO:
@@ -416,18 +414,18 @@
       return;
     }
     Task<Object> showFirstTermTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
         try {
-          
+
           fld = (String) fieldsList.getSelectedItem();
           System.out.println("fld:" + fld);
           Terms terms = MultiFields.getTerms(ir, fld);
@@ -441,20 +439,21 @@
         }
         // ai.setActive(false);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
       }
     };
-    
+
     showFirstTermTask.execute(new TaskAdapter<Object>(taskListener));
-    
+
   }
-  
+
   public void showFirstTermDoc() {
-    
-    if (lastTerm == null) return;
+
+    if (lastTerm == null)
+      return;
     if (ir == null) {
       // TODO:
       // showStatus(resources.get("documentsTab_noOrClosedIndex"));
@@ -461,19 +460,18 @@
       return;
     }
     Task<Object> showFirstTermDocTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
         try {
-          DocsAndPositionsEnum td = MultiFields.getTermPositionsEnum(ir, null,
-              lastTerm.field(), lastTerm.bytes());
+          DocsAndPositionsEnum td = MultiFields.getTermPositionsEnum(ir, null, lastTerm.field(), lastTerm.bytes());
           td.nextDoc();
           tdNum.setText("1");
           DocumentsTab.this.td = td;
@@ -485,19 +483,20 @@
         }
         // ai.setActive(false);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
       }
     };
-    
+
     showFirstTermDocTask.execute(new TaskAdapter<Object>(taskListener));
-    
+
   }
-  
+
   public void showNextTermDoc() {
-    if (lastTerm == null) return;
+    if (lastTerm == null)
+      return;
     if (ir == null) {
       // TODO:
       // showStatus(MSG_NOINDEX);
@@ -504,13 +503,13 @@
       return;
     }
     Task<Object> showNextTermDocTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
@@ -519,16 +518,17 @@
             showFirstTermDoc();
             return;
           }
-          if (td.nextDoc() == DocsEnum.NO_MORE_DOCS) return;
-          
+          if (td.nextDoc() == DocsEnum.NO_MORE_DOCS)
+            return;
+
           String sCnt = tdNum.getText();
           int cnt = 1;
           try {
             cnt = Integer.parseInt(sCnt);
           } catch (Exception e) {}
-          
+
           tdNum.setText(String.valueOf(cnt + 1));
-          
+
           showTermDoc();
         } catch (Exception e) {
           e.printStackTrace();
@@ -537,17 +537,17 @@
         }
         // ai.setActive(false);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
       }
     };
-    
+
     showNextTermDocTask.execute(new TaskAdapter<Object>(taskListener));
-    
+
   }
-  
+
   private void showTerm(final Term t) {
     if (t == null) {
       // TODO:
@@ -559,12 +559,13 @@
       // showStatus(resources.get("documentsTab_noOrClosedIndex"));
       return;
     }
-    
+
     lastTerm = t;
-    
+
     fieldsList.setSelectedItem(t.field());
     Decoder dec = lukeMediator.getDecoders().get(t.field());
-    if (dec == null) dec = lukeMediator.getDefDecoder();
+    if (dec == null)
+      dec = lukeMediator.getDefDecoder();
     String s = null;
     boolean decodeErr = false;
     try {
@@ -573,12 +574,12 @@
       s = e.getMessage();
       decodeErr = true;
     }
-    
+
     termText.setText(t.text());
-    
+
     if (!s.equals(t.text())) {
       decText.setText(s);
-      
+
       if (decodeErr) {
         // setColor(rawText, "foreground", Color.RED);
       } else {
@@ -588,30 +589,30 @@
       decText.setText("");
       // setColor(rawText, "foreground", Color.BLACK);
     }
-    
+
     lastTerm = t;
     // putProperty(fText, "decText", s);
-    
+
     td = null;
     tdNum.setText("?");
     tFreq.setText("?");
-    
+
     Task<Object> updateDfTdTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-      
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
-        
+
         try {
           int freq = ir.docFreq(t);
           dFreq.setText(String.valueOf(freq));
-          
+
           tdMax.setText(String.valueOf(freq));
         } catch (Exception e) {
           e.printStackTrace();
@@ -621,17 +622,17 @@
         }
         // ai.setActive(false);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
       }
     };
-    
+
     updateDfTdTask.execute(new TaskAdapter<Object>(taskListener));
 
   }
-  
+
   public void showNextTerm() {
     if (ir == null) {
       // TODO:
@@ -639,13 +640,13 @@
       return;
     }
     Task<Object> showNextTermTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
@@ -656,9 +657,9 @@
             showFirstTerm();
             return;
           }
-          
+
           String fld = (String) fieldsList.getSelectedItem();
-          
+
           SeekStatus status;
           BytesRef rawTerm = null;
           if (te != null) {
@@ -665,12 +666,11 @@
             rawTerm = te.term();
           }
           String rawString = rawTerm != null ? rawTerm.utf8ToString() : null;
-          
-          if (te == null || !DocumentsTab.this.fld.equals(fld)
-              || !text.equals(rawString)) {
+
+          if (te == null || !DocumentsTab.this.fld.equals(fld) || !text.equals(rawString)) {
             Terms terms = MultiFields.getTerms(ir, fld);
             te = terms.iterator(null);
-            
+
             DocumentsTab.this.fld = fld;
             status = te.seekCeil(new BytesRef(text));
             if (status.equals(SeekStatus.FOUND)) {
@@ -702,7 +702,7 @@
             // showStatus("No more terms");
             return;
           }
-          
+
           showTerm(new Term(fld, rawTerm));
         } catch (Exception e) {
           e.printStackTrace();
@@ -711,17 +711,17 @@
         }
         // ai.setActive(false);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
       }
     };
-    
+
     showNextTermTask.execute(new TaskAdapter<Object>(taskListener));
-    
+
   }
-  
+
   private void showTermDoc() {
     if (ir == null) {
       // TODO:
@@ -729,13 +729,13 @@
       return;
     }
     Task<Object> showTermDocTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
@@ -742,9 +742,9 @@
         try {
           Document doc = ir.document(td.docID());
           docNum.setText(String.valueOf(td.docID()));
-          
+
           tFreq.setText(String.valueOf(td.freq()));
-          
+
           popTableWithDoc(td.docID(), doc);
         } catch (Exception e) {
           e.printStackTrace();
@@ -751,20 +751,20 @@
           // TODO:
           // showStatus(e.getMessage());
         }
-        
+
         // ai.setActive(false);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
       }
     };
-    
+
     showTermDocTask.execute(new TaskAdapter<Object>(taskListener));
-    
+
   }
-  
+
   public void showAllTermDoc() {
     final IndexReader ir = lukeMediator.getIndexInfo().getReader();
     if (ir == null) {
@@ -786,13 +786,13 @@
     final Query q = new TermQuery(lastTerm);
     // parsedQueryLabel.setText(q.toString());
     Task<Object> showAllTermDocTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
@@ -811,7 +811,7 @@
         // ai.setActive(false);
         // lukeWindow.setEnabled(true);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
@@ -818,9 +818,9 @@
         // lukeWindow.setEnabled(true);
       }
     };
-    
+
     showAllTermDocTask.execute(new TaskAdapter<Object>(taskListener));
-    
+
   }
-  
+
 }
Index: src/org/apache/lucene/luke/ui/LukeInitWindow.bxml
===================================================================
--- src/org/apache/lucene/luke/ui/LukeInitWindow.bxml	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/LukeInitWindow.bxml	(working copy)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<luke:LukeInitWindow bxml:id="lukeinit" icon="/img/luke.gif" title="%lukeInitWindow_title"
-	xmlns:bxml="http://pivot.apache.org/bxml" xmlns:luke="org.apache.lucene.luke.ui"
-    xmlns:content="org.apache.pivot.wtk.content"
-    xmlns="org.apache.pivot.wtk">
+<luke:LukeInitWindow bxml:id="lukeinit" icon="/img/luke.gif"
+	title="%lukeInitWindow_title" xmlns:bxml="http://pivot.apache.org/bxml"
+	xmlns:luke="org.apache.lucene.luke.ui" xmlns:content="org.apache.pivot.wtk.content"
+	xmlns="org.apache.pivot.wtk">
 	<content>
 		<BoxPane orientation="vertical" styles="{padding:6, spacing:8, fill:true}">
 			<TablePane bxml:id="tablePane1"
@@ -41,10 +41,8 @@
 				<Checkbox bxml:id="ramDir" buttonData="%lukeInitWindow_ramDirectory" />
 				<Checkbox bxml:id="keepCommits" buttonData="%lukeInitWindow_keepCommitPoints"
 					selected="true" />
-				<Checkbox bxml:id="dontOpenReader"
-					buttonData="%lukeInitWindow_dontOpenReader" />
-				<Checkbox bxml:id="slowIO"
-					buttonData="%lukeInitWindow_slowIO" />
+				<Checkbox bxml:id="dontOpenReader" buttonData="%lukeInitWindow_dontOpenReader" />
+				<Checkbox bxml:id="slowIO" buttonData="%lukeInitWindow_slowIO" />
 				<BoxPane orientation="horizontal">
 					<Label text="%lukeInitWindow_termInfosDiv" />
 					<Spinner bxml:id="tiiDiv" preferredWidth="40"
@@ -58,11 +56,13 @@
 			</BoxPane>
 			<Separator />
 			<BoxPane orientation="horizontal" styles="{horizontalAlignment:'right'}">
-				<PushButton buttonData="OK" action="openIndex" ButtonPressListener.buttonPressed="lukeinit.close()">
+				<PushButton buttonData="OK" action="openIndex"
+					ButtonPressListener.buttonPressed="lukeinit.close()">
 
 				</PushButton>
-				<PushButton buttonData="Cancel" ButtonPressListener.buttonPressed="lukeinit.close()">
-					
+				<PushButton buttonData="Cancel"
+					ButtonPressListener.buttonPressed="lukeinit.close()">
+
 				</PushButton>
 			</BoxPane>
 
Index: src/org/apache/lucene/luke/ui/LukeInitWindow.java
===================================================================
--- src/org/apache/lucene/luke/ui/LukeInitWindow.java	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/LukeInitWindow.java	(working copy)
@@ -39,16 +39,22 @@
 import org.apache.pivot.wtk.TextInput;
 
 public class LukeInitWindow extends Dialog implements Bindable {
-  @BXML TextInput indexPath;
-  @BXML Checkbox ramDir;
-  @BXML Checkbox ram;
-  @BXML Checkbox readOnly;
-  @BXML Checkbox keepCommits;
-  @BXML Spinner tiiDiv;
-  @BXML TextInput directory;
+  @BXML
+  TextInput indexPath;
+  @BXML
+  Checkbox ramDir;
+  @BXML
+  Checkbox ram;
+  @BXML
+  Checkbox readOnly;
+  @BXML
+  Checkbox keepCommits;
+  @BXML
+  Spinner tiiDiv;
+  @BXML
+  TextInput directory;
   private LukeMediator lukeMediator;
 
-  
   public LukeInitWindow() {
     Action.getNamedActions().put("browse", new Action() {
       @Override
@@ -59,29 +65,25 @@
     Action.getNamedActions().put("openIndex", new Action() {
       @Override
       public void perform(Component component) {
-        lukeMediator.getLukeWindow().openIndex(false, directory.getText(),
-            readOnly.isSelected(), false,
-            keepCommits.isSelected(), null,
-            (Integer)tiiDiv.getSelectedItem());
+        lukeMediator.getLukeWindow().openIndex(false, directory.getText(), readOnly.isSelected(), false, keepCommits.isSelected(), null,
+            (Integer) tiiDiv.getSelectedItem());
       }
     });
   }
-  
+
   public void initLukeMediator(LukeMediator lukeMediator) {
     this.lukeMediator = lukeMediator;
   }
-  
+
   @Override
-  public void initialize(Map<String,Object> namespace, URL location,
-      Resources resources) {
+  public void initialize(Map<String,Object> namespace, URL location, Resources resources) {
 
   }
-  
+
   private void openDialogue() {
-    
-    final FileBrowserSheet fileBrowserSheet = new FileBrowserSheet(
-        FileBrowserSheet.Mode.SAVE_TO);
-    
+
+    final FileBrowserSheet fileBrowserSheet = new FileBrowserSheet(FileBrowserSheet.Mode.SAVE_TO);
+
     fileBrowserSheet.open(this, new SheetCloseListener() {
       @Override
       public void sheetClosed(Sheet sheet) {
@@ -94,5 +96,4 @@
       }
     });
   }
-
 }
Index: src/org/apache/lucene/luke/ui/LukeWindow.bxml
===================================================================
--- src/org/apache/lucene/luke/ui/LukeWindow.bxml	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/LukeWindow.bxml	(working copy)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<luke:LukeWindow bxml:id="lukeWindow"
-	title="%lukeWindow_title" icon="/img/luke.gif"
-	xmlns:bxml="http://pivot.apache.org/bxml" xmlns:luke="org.apache.lucene.luke.ui"
-	xmlns:content="org.apache.pivot.wtk.content" xmlns="org.apache.pivot.wtk"
-	maximized="true" styles="{backgroundColor:11, showWindowControls:false}">
+<luke:LukeWindow bxml:id="lukeWindow" title="%lukeWindow_title"
+	icon="/img/luke.gif" xmlns:bxml="http://pivot.apache.org/bxml"
+	xmlns:luke="org.apache.lucene.luke.ui" xmlns:content="org.apache.pivot.wtk.content"
+	xmlns="org.apache.pivot.wtk" maximized="true"
+	styles="{backgroundColor:11, showWindowControls:false}">
 
 	<bxml:define>
 		<bxml:include bxml:id="lukeInitWindow" src="LukeInitWindow.bxml" />
@@ -23,9 +23,10 @@
 									</Menu.Item>
 									<Menu.Item buttonData="%commitChanges">
 										<buttonData />
-
-
 									</Menu.Item>
+									<Menu.Item buttonData="%exit"
+										ButtonPressListener.buttonPressed="lukeWindow.exitLuke()">
+									</Menu.Item>
 								</Menu.Section>
 							</sections>
 						</Menu>
@@ -50,8 +51,17 @@
 						<Menu>
 							<sections>
 								<Menu.Section>
-									<Menu.Item buttonData="Display Font..." />
-									<Menu.Item buttonData="Color Schemes">
+									<Menu.Item buttonData="Display Font" />
+									<Menu.Item bxml:id="colormenu" buttonData="Color Schemes">
+										<Menu>
+											<Menu.Section>
+												<Menu.Item action="defaulttheme" buttonData="%defaultTheme" />
+												<Menu.Item action="graytheme" buttonData="%grayTheme" />
+												<Menu.Item action="sandstonetheme" buttonData="%sandstoneTheme" />
+												<Menu.Item action="skytheme" buttonData="%skyTheme" />
+												<Menu.Item action="navytheme" buttonData="%navyTheme" />
+											</Menu.Section>
+										</Menu>
 										<buttonData />
 									</Menu.Item>
 								</Menu.Section>
@@ -74,64 +84,85 @@
 		</MenuBar>
 	</menuBar>
 	<content>
-		<TabPane bxml:id="tabPane">
-			<tabs>
-				<Border styles="{backgroundColor:11,thickness:0}">
-					<TabPane.tabData>
-						<content:ButtonData icon="/img/info.gif" text="%lukeWindow_overviewTabText" />
-					</TabPane.tabData>
-					<content>
-						<bxml:include bxml:id="overviewTab" src="OverviewTab.bxml" />
-					</content>
-				</Border>
+		<TablePane>
+			<columns>
+				<TablePane.Column width="1*" />
+			</columns>
+			<rows>
+				<TablePane.Row height="1*">
+					<TabPane bxml:id="tabPane">
+						<tabs>
+							<Border styles="{backgroundColor:11,thickness:0}">
+								<TabPane.tabData>
+									<content:ButtonData icon="/img/info.gif"
+										text="%lukeWindow_overviewTabText" />
+								</TabPane.tabData>
+								<content>
+									<bxml:include bxml:id="overviewTab" src="OverviewTab.bxml"
+										inline="true" />
+								</content>
+							</Border>
 
-				<Border>
-					<TabPane.tabData>
-						<content:ButtonData icon="/img/docs.gif" text="%lukeWindow_documentsTabText" />
-					</TabPane.tabData>
-					<content>
-						<bxml:include bxml:id="documentsTab" src="DocumentsTab.bxml" />
-					</content>
+							<Border>
+								<TabPane.tabData>
+									<content:ButtonData icon="/img/docs.gif"
+										text="%lukeWindow_documentsTabText" />
+								</TabPane.tabData>
+								<content>
+									<bxml:include bxml:id="documentsTab" src="DocumentsTab.bxml"
+										inline="true" />
+								</content>
 
-				</Border>
+							</Border>
 
-				<Border  styles="{backgroundColor:11}">
-				    <TabPane.tabData>
-						<content:ButtonData icon="/img/search.gif" text="%lukeWindow_searchTabText" />
-					</TabPane.tabData>
-					
-					<content>
-						<bxml:include bxml:id="searchTab" src="SearchTab.bxml" />
-					</content>
-				</Border>
-				
-				<Border  styles="{backgroundColor:11}">
-				    <TabPane.tabData>
-						<content:ButtonData icon="/img/terms.gif" text="%lukeWindow_analyzersTabText" />
-					</TabPane.tabData>
-					
-					<content>
-						<bxml:include bxml:id="analyzersTab" src="AnalyzersTab.bxml" />
-					</content>
-				</Border>
+							<Border styles="{backgroundColor:11}">
+								<TabPane.tabData>
+									<content:ButtonData icon="/img/search.gif"
+										text="%lukeWindow_searchTabText" />
+								</TabPane.tabData>
 
-				<Border>
-					<TabPane.tabData>
-						<content:ButtonData icon="/img/files.gif" text="%lukeWindow_filesTabText" />
-					</TabPane.tabData>
-					<content>
-						<bxml:include bxml:id="filesTab" src="FilesTab.bxml" />
-					</content>
-				</Border>
-				<BoxPane styles="{fill:true}">
-					<TabPane.tabData>
-						<content:ButtonData icon="/img/tools.gif" text="%lukeWindow_pluginsTabText" />
-	
-					</TabPane.tabData>
-					<Label text="Coming..."/>
-				</BoxPane>
-			</tabs>
-		</TabPane>
+								<content>
+									<bxml:include bxml:id="searchTab" src="SearchTab.bxml"
+										inline="true" />
+								</content>
+							</Border>
+
+							<Border styles="{backgroundColor:11}">
+								<TabPane.tabData>
+									<content:ButtonData icon="/img/terms.gif"
+										text="%lukeWindow_analyzersTabText" />
+								</TabPane.tabData>
+
+								<content>
+									<bxml:include bxml:id="analyzersTab" src="AnalyzersTab.bxml"
+										inline="true" />
+								</content>
+							</Border>
+
+							<Border>
+								<TabPane.tabData>
+									<content:ButtonData icon="/img/files.gif"
+										text="%lukeWindow_filesTabText" />
+								</TabPane.tabData>
+								<content>
+									<bxml:include bxml:id="filesTab" src="FilesTab.bxml"
+										inline="true" />
+								</content>
+							</Border>
+							<BoxPane styles="{fill:true}">
+								<TabPane.tabData>
+									<content:ButtonData icon="/img/tools.gif"
+										text="%lukeWindow_pluginsTabText" />
+								</TabPane.tabData>
+								<Label text="Coming..." />
+							</BoxPane>
+						</tabs>
+					</TabPane>
+				</TablePane.Row>
+				<TablePane.Row>
+					<Label bxml:id="statusLabel" text="" styles="{padding:2}" />
+				</TablePane.Row>
+			</rows>
+		</TablePane>
 	</content>
-</luke:LukeWindow>
-
+</luke:LukeWindow>	
Index: src/org/apache/lucene/luke/ui/SearchTab.java
===================================================================
--- src/org/apache/lucene/luke/ui/SearchTab.java	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/SearchTab.java	(working copy)
@@ -64,12 +64,11 @@
 import org.apache.pivot.wtk.TextArea;
 
 public class SearchTab extends SplitPane implements Bindable {
-  
+
   private LukeMediator lukeMediator;
-  
+
   private Analyzer stdAnalyzer = new StandardAnalyzer(Version.LUCENE_CURRENT);
 
-  
   @BXML
   private TextArea queryTextArea;
   @BXML
@@ -84,7 +83,7 @@
   private DecimalFormat df = new DecimalFormat("0.0000");
 
   private IndexInfo indexInfo;
-  
+
   public SearchTab() {
     Action.getNamedActions().put("search", new Action() {
       @Override
@@ -92,7 +91,7 @@
         search();
       }
     });
-    
+
     Action.getNamedActions().put("showParsed", new Action() {
       @Override
       public void perform(Component component) {
@@ -107,22 +106,21 @@
     });
 
   }
-  
+
   @Override
-  public void initialize(Map<String,Object> namespace, URL location,
-      Resources resources) {
+  public void initialize(Map<String,Object> namespace, URL location, Resources resources) {
+  }
 
-  }
-  
   public void initLukeMediator(LukeMediator lukeMediator) {
     this.lukeMediator = lukeMediator;
     String lastAnalyzer = Prefs.getProperty(Prefs.P_ANALYZER);
-    if (lastAnalyzer != null) analyzerList.setSelectedItem(lastAnalyzer);
+    if (lastAnalyzer != null)
+      analyzerList.setSelectedItem(lastAnalyzer);
 
     analyzerList.setListData(new ArrayList<String>(lukeMediator.getAnalyzerNames()));
     analyzerList.setSelectedIndex(0);
   }
-  
+
   /**
    * Initialize GUI elements. This method is called when a new index is opened.
    * 
@@ -131,13 +129,13 @@
   public void onOpenIndex() throws Exception {
     this.indexInfo = lukeMediator.getIndexInfo();
   }
-  
+
   /**
    * Update the parsed and rewritten query views.
-   *
+   * 
    */
   public void showParsed(String query) {
-    //Object qField = find("qField");
+    // Object qField = find("qField");
 
     if (query.trim().equals("")) {
       parsedQueryLabel.setText("<empty query>");
@@ -146,29 +144,29 @@
     try {
       Query q = createQuery(query);
       parsedQueryLabel.setText(q.toString());
-      //putProperty(qField, "qParsed", q);
+      // putProperty(qField, "qParsed", q);
       q = q.rewrite(lukeMediator.getIndexInfo().getReader());
       rewrittenQueryLabel.setText(q.toString());
-      //putProperty(qField, "qRewritten", q);
+      // putProperty(qField, "qRewritten", q);
     } catch (Throwable t) {
       parsedQueryLabel.setText(t.getMessage());
-      //setString(qFieldRewritten, "text", t.getMessage());
+      // setString(qFieldRewritten, "text", t.getMessage());
     }
   }
-  
+
   public void search() {
     if (lukeMediator.getIndexInfo().getReader() == null) {
-      //TODO: 
-      //showStatus(MSG_NOINDEX);
+      // TODO:
+      // showStatus(MSG_NOINDEX);
       return;
     }
     String query = queryTextArea.getText();
     if (query.trim().equals("")) {
-    //TODO: 
-      //showStatus("FAILED: Empty query.");
+      // TODO:
+      // showStatus("FAILED: Empty query.");
       return;
     }
-    Object srchOpts = null; //find("srchOptTabs");
+    Object srchOpts = null; // find("srchOptTabs");
     // query parser opts
     DefaultSimilarity sim = createSimilarity();
     AccessibleHitCollector col;
@@ -175,14 +173,14 @@
     try {
       col = createCollector();
     } catch (Throwable t) {
-      //TODO:
-      //errorMsg("ERROR creating Collector: " + t.getMessage());
+      // TODO:
+      // errorMsg("ERROR creating Collector: " + t.getMessage());
       return;
     }
 
-    //Object cntRepeat = find("cntRepeat");
-    int repeat = 1; //Integer.parseInt(getString(cntRepeat, "text"));
-    //removeAll(sTable);
+    // Object cntRepeat = find("cntRepeat");
+    int repeat = 1; // Integer.parseInt(getString(cntRepeat, "text"));
+    // removeAll(sTable);
     Query q = null;
     try {
       q = createQuery(query);
@@ -194,7 +192,7 @@
       errorMsg(e.getMessage());
     }
   }
-  
+
   int resStart = 0;
   int resCount = 20;
   LimitedException le = null;
@@ -203,8 +201,7 @@
 
   protected AccessibleHitCollector collector;
 
-  private void search(final Query q, final IndexSearcher is,
-      AccessibleHitCollector hc, final int repeat) throws Exception {
+  private void search(final Query q, final IndexSearcher is, AccessibleHitCollector hc, final int repeat) throws Exception {
     if (hc == null) {
       hc = new AccessibleTopHitCollector(1000, true, true);
     }
@@ -211,13 +208,13 @@
     final AccessibleHitCollector collector = hc;
     le = null;
     Task<Object> collectTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
@@ -267,7 +264,7 @@
           // setString(find("resNum"), "text", "0");
           return;
         }
-        
+
         if (resNum > resCount) {
           // setBoolean(bsNext, "enabled", true);
         }
@@ -284,7 +281,7 @@
         // ai.setActive(false);
         // lukeWindow.setEnabled(true);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         // ai.setActive(false);
@@ -291,62 +288,61 @@
         // lukeWindow.setEnabled(true);
       }
     };
-    
+
     collectTask.execute(new TaskAdapter<Object>(taskListener));
   }
-  
-  
+
   /**
-   * Create a Query instance that corresponds to values selected in the UI,
-   * such as analyzer class name and arguments, and default field.
+   * Create a Query instance that corresponds to values selected in the UI, such as analyzer class name and arguments, and default field.
+   * 
    * @return
    */
   public Query createQuery(String queryString) throws Exception {
-    //Object srchOpts = find("srchOptTabs");
+    // Object srchOpts = find("srchOptTabs");
     analyzer = createAnalyzer();
     Object srchOpts = null;
     String defField = getDefaultField(srchOpts);
     QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defField, analyzer);
-//    Object ckXmlParser = find(srchOpts, "ckXmlParser");
-//    Object ckWild = find(srchOpts, "ckWild");
-//    Object ckPosIncr = find(srchOpts, "ckPosIncr");
-//    Object ckLoExp = find(srchOpts, "ckLoExp");
-//    Object cbDateRes = find(srchOpts, "cbDateRes");
-//    DateTools.Resolution resolution = Util.getResolution(getString(cbDateRes, "text"));
-//    Object cbOp = find(srchOpts, "cbOp");
-//    Object bqMaxCount = find(srchOpts, "bqMaxCount");
+    // Object ckXmlParser = find(srchOpts, "ckXmlParser");
+    // Object ckWild = find(srchOpts, "ckWild");
+    // Object ckPosIncr = find(srchOpts, "ckPosIncr");
+    // Object ckLoExp = find(srchOpts, "ckLoExp");
+    // Object cbDateRes = find(srchOpts, "cbDateRes");
+    // DateTools.Resolution resolution = Util.getResolution(getString(cbDateRes, "text"));
+    // Object cbOp = find(srchOpts, "cbOp");
+    // Object bqMaxCount = find(srchOpts, "bqMaxCount");
     int maxCount = 1024;
     try {
-      //maxCount = Integer.parseInt(getString(bqMaxCount, "text"));
+      // maxCount = Integer.parseInt(getString(bqMaxCount, "text"));
     } catch (Exception e) {
       e.printStackTrace();
-      //TODO:
-      //showStatus("Invalid BooleanQuery max clause count, using default 1024");
+      // TODO:
+      // showStatus("Invalid BooleanQuery max clause count, using default 1024");
     }
     QueryParser.Operator op;
     BooleanQuery.setMaxClauseCount(maxCount);
- 
-//    qp.setAllowLeadingWildcard(getBoolean(ckWild, "selected"));
-//    qp.setEnablePositionIncrements(getBoolean(ckPosIncr, "selected"));
-//    qp.setLowercaseExpandedTerms(getBoolean(ckLoExp, "selected"));
-//    qp.setDateResolution(resolution);
-//    qp.setDefaultOperator(op);
-//    if (getBoolean(ckXmlParser, "selected")) {
-//      
-//      CoreParser cp = createParser(defField,analyzer);
-//      Query q = cp.parse(new ByteArrayInputStream(queryString.getBytes("UTF-8")));
-//      return q;
-//    } else {
-      return qp.parse(queryString);
-//    }
+
+    // qp.setAllowLeadingWildcard(getBoolean(ckWild, "selected"));
+    // qp.setEnablePositionIncrements(getBoolean(ckPosIncr, "selected"));
+    // qp.setLowercaseExpandedTerms(getBoolean(ckLoExp, "selected"));
+    // qp.setDateResolution(resolution);
+    // qp.setDefaultOperator(op);
+    // if (getBoolean(ckXmlParser, "selected")) {
+    //
+    // CoreParser cp = createParser(defField,analyzer);
+    // Query q = cp.parse(new ByteArrayInputStream(queryString.getBytes("UTF-8")));
+    // return q;
+    // } else {
+    return qp.parse(queryString);
+    // }
   }
-  
+
   protected String getDefaultField(Object srchOptTabs) {
-    String defField = null; //getString(find(srchOptTabs, "defFld"), "text");
+    String defField = null; // getString(find(srchOptTabs, "defFld"), "text");
     if (defField == null || defField.trim().equals("")) {
       if (lukeMediator.getIndexInfo().getReader() != null) {
         defField = lukeMediator.getIndexInfo().getFieldNames().get(0);
-        //setString(find(srchOptTabs, "defFld"), "text", defField);
+        // setString(find(srchOptTabs, "defFld"), "text", defField);
       } else {
         defField = "DEFAULT";
       }
@@ -353,21 +349,22 @@
     }
     return defField;
   }
-  
+
   public Analyzer createAnalyzer() {
     Analyzer res = null;
     String sAType = (String) analyzerList.getSelectedItem();
     if (sAType.trim().equals("")) {
       sAType = "org.apache.lucene.analysis.standard.StandardAnalyzer";
-      //setString(find("cbType"), "text", sAType);
+      // setString(find("cbType"), "text", sAType);
       analyzerList.setSelectedItem(sAType);
     }
-    String arg = null; //getString(find(srchOpts, "snoName"), "text");
-    if (arg == null) arg = "";
+    String arg = null; // getString(find(srchOpts, "snoName"), "text");
+    if (arg == null)
+      arg = "";
     try {
       Constructor zeroArg = null, zeroArgV = null, oneArg = null, oneArgV = null;
       try {
-        zeroArgV = Class.forName(sAType).getConstructor(new Class[]{Version.class});
+        zeroArgV = Class.forName(sAType).getConstructor(new Class[] {Version.class});
       } catch (NoSuchMethodException e) {
         zeroArgV = null;
         try {
@@ -377,11 +374,11 @@
         }
       }
       try {
-        oneArgV = Class.forName(sAType).getConstructor(new Class[]{Version.class, String.class});
+        oneArgV = Class.forName(sAType).getConstructor(new Class[] {Version.class, String.class});
       } catch (NoSuchMethodException e) {
         oneArgV = null;
         try {
-          oneArg = Class.forName(sAType).getConstructor(new Class[]{String.class});
+          oneArg = Class.forName(sAType).getConstructor(new Class[] {String.class});
         } catch (NoSuchMethodException e1) {
           oneArg = null;
         }
@@ -388,25 +385,25 @@
       }
       if (arg.length() == 0) {
         if (zeroArgV != null) {
-          res = (Analyzer)zeroArgV.newInstance(Version.LUCENE_CURRENT);
+          res = (Analyzer) zeroArgV.newInstance(Version.LUCENE_CURRENT);
         } else if (zeroArg != null) {
-          res = (Analyzer)zeroArg.newInstance();
+          res = (Analyzer) zeroArg.newInstance();
         } else if (oneArgV != null) {
-          res = (Analyzer)oneArgV.newInstance(new Object[]{Version.LUCENE_CURRENT, arg});
+          res = (Analyzer) oneArgV.newInstance(new Object[] {Version.LUCENE_CURRENT, arg});
         } else if (oneArg != null) {
-          res = (Analyzer)oneArg.newInstance(new Object[]{arg});
+          res = (Analyzer) oneArg.newInstance(new Object[] {arg});
         } else {
           throw new Exception("Must have a zero-arg or (Version) or (Version, String) constructor");
         }
       } else {
         if (oneArgV != null) {
-          res = (Analyzer)oneArgV.newInstance(new Object[]{Version.LUCENE_CURRENT, arg});
+          res = (Analyzer) oneArgV.newInstance(new Object[] {Version.LUCENE_CURRENT, arg});
         } else if (oneArg != null) {
-          res = (Analyzer)oneArg.newInstance(new Object[]{arg});
+          res = (Analyzer) oneArg.newInstance(new Object[] {arg});
         } else if (zeroArgV != null) {
-          res = (Analyzer)zeroArgV.newInstance(new Object[]{Version.LUCENE_CURRENT});
+          res = (Analyzer) zeroArgV.newInstance(new Object[] {Version.LUCENE_CURRENT});
         } else if (zeroArg != null) {
-          res = (Analyzer)zeroArg.newInstance(new Object[0]);
+          res = (Analyzer) zeroArg.newInstance(new Object[0]);
         } else {
           throw new Exception("Must have a zero-arg or (String) constructor");
         }
@@ -419,78 +416,78 @@
     Prefs.setProperty(Prefs.P_ANALYZER, res.getClass().getName());
     return res;
   }
-  
+
   public DefaultSimilarity createSimilarity() {
-//    Object ckSimDef = find(srchOpts, "ckSimDef");
-//    Object ckSimSweet = find(srchOpts, "ckSimSweet");
-//    Object ckSimOther = find(srchOpts, "ckSimOther");
-//    Object simClass = find(srchOpts, "simClass");
-//    Object ckSimCust = find(srchOpts, "ckSimCust");
-//    if (getBoolean(ckSimDef, "selected")) {
-//      return new DefaultSimilarity();
-//    } else if (getBoolean(ckSimSweet, "selected")) {
-//      return new SweetSpotSimilarity();
-//    } else if (getBoolean(ckSimOther, "selected")) {
-//      try {
-//        Class clazz = Class.forName(getString(simClass, "text"));
-//        if (Similarity.class.isAssignableFrom(clazz)) {
-//          Similarity sim = (Similarity)clazz.newInstance();
-//          return sim;
-//        } else {
-//          throw new Exception("Not a subclass of Similarity: " + clazz.getName());
-//        }
-//      } catch (Exception e) {
-//        e.printStackTrace();
-//        showStatus("ERROR: invalid Similarity, using default");
-//        setBoolean(ckSimDef, "selected", true);
-//        setBoolean(ckSimOther, "selected", false);
-//        return new DefaultSimilarity();
-//      }
-//    } else if (getBoolean(ckSimCust, "selected")) {
-//      return similarity;
-//    } else {
-      return new DefaultSimilarity();
-    //}
+    // Object ckSimDef = find(srchOpts, "ckSimDef");
+    // Object ckSimSweet = find(srchOpts, "ckSimSweet");
+    // Object ckSimOther = find(srchOpts, "ckSimOther");
+    // Object simClass = find(srchOpts, "simClass");
+    // Object ckSimCust = find(srchOpts, "ckSimCust");
+    // if (getBoolean(ckSimDef, "selected")) {
+    // return new DefaultSimilarity();
+    // } else if (getBoolean(ckSimSweet, "selected")) {
+    // return new SweetSpotSimilarity();
+    // } else if (getBoolean(ckSimOther, "selected")) {
+    // try {
+    // Class clazz = Class.forName(getString(simClass, "text"));
+    // if (Similarity.class.isAssignableFrom(clazz)) {
+    // Similarity sim = (Similarity)clazz.newInstance();
+    // return sim;
+    // } else {
+    // throw new Exception("Not a subclass of Similarity: " + clazz.getName());
+    // }
+    // } catch (Exception e) {
+    // e.printStackTrace();
+    // showStatus("ERROR: invalid Similarity, using default");
+    // setBoolean(ckSimDef, "selected", true);
+    // setBoolean(ckSimOther, "selected", false);
+    // return new DefaultSimilarity();
+    // }
+    // } else if (getBoolean(ckSimCust, "selected")) {
+    // return similarity;
+    // } else {
+    return new DefaultSimilarity();
+    // }
   }
-  
+
   public AccessibleHitCollector createCollector() throws Exception {
-      boolean orderRes = false;
-      boolean scoreRes = false;
-      //    Object ckNormRes = find(srchOpts, "ckNormRes");
-//    Object ckAllRes = find(srchOpts, "ckAllRes");
-//    Object ckLimRes = find(srchOpts, "ckLimRes");
-//    Object ckLimTime = find(srchOpts, "ckLimTime");
-//    Object limTime = find(srchOpts, "limTime");
-//    Object ckLimCount = find(srchOpts, "ckLimCount");
-//    Object limCount = find(srchOpts, "limCount");
-//    Object ckScoreRes = find(srchOpts, "ckScoreRes");
-//    Object ckOrderRes = find(srchOpts, "ckOrderRes");
-//    boolean scoreRes = getBoolean(ckScoreRes, "selected");
-//    boolean orderRes = getBoolean(ckOrderRes, "selected");
-//    Collector hc = null;
-//    if (getBoolean(ckNormRes, "selected")) {
-      return new AccessibleTopHitCollector(1000, orderRes, scoreRes);
-//    } else if (getBoolean(ckAllRes, "selected")) {
-//      return new AllHitsCollector(orderRes, scoreRes);
-//    } else if (getBoolean(ckLimRes, "selected")) {
-//      // figure out the type
-//      if (getBoolean(ckLimCount, "selected")) {
-//        int lim = Integer.parseInt(getString(limCount, "text"));
-//        return new CountLimitedHitCollector(lim, orderRes, scoreRes);
-//      } else if (getBoolean(ckLimTime, "selected")) {
-//        int lim = Integer.parseInt(getString(limTime, "text"));
-//        return new IntervalLimitedCollector(lim, orderRes, scoreRes);
-//      } else {
-//        throw new Exception("Unknown LimitedHitCollector type");
-//      }
-//    } else {
-//      throw new Exception("Unknown HitCollector type");
-//    }
+    boolean orderRes = false;
+    boolean scoreRes = false;
+    // Object ckNormRes = find(srchOpts, "ckNormRes");
+    // Object ckAllRes = find(srchOpts, "ckAllRes");
+    // Object ckLimRes = find(srchOpts, "ckLimRes");
+    // Object ckLimTime = find(srchOpts, "ckLimTime");
+    // Object limTime = find(srchOpts, "limTime");
+    // Object ckLimCount = find(srchOpts, "ckLimCount");
+    // Object limCount = find(srchOpts, "limCount");
+    // Object ckScoreRes = find(srchOpts, "ckScoreRes");
+    // Object ckOrderRes = find(srchOpts, "ckOrderRes");
+    // boolean scoreRes = getBoolean(ckScoreRes, "selected");
+    // boolean orderRes = getBoolean(ckOrderRes, "selected");
+    // Collector hc = null;
+    // if (getBoolean(ckNormRes, "selected")) {
+    return new AccessibleTopHitCollector(1000, orderRes, scoreRes);
+    // } else if (getBoolean(ckAllRes, "selected")) {
+    // return new AllHitsCollector(orderRes, scoreRes);
+    // } else if (getBoolean(ckLimRes, "selected")) {
+    // // figure out the type
+    // if (getBoolean(ckLimCount, "selected")) {
+    // int lim = Integer.parseInt(getString(limCount, "text"));
+    // return new CountLimitedHitCollector(lim, orderRes, scoreRes);
+    // } else if (getBoolean(ckLimTime, "selected")) {
+    // int lim = Integer.parseInt(getString(limTime, "text"));
+    // return new IntervalLimitedCollector(lim, orderRes, scoreRes);
+    // } else {
+    // throw new Exception("Unknown LimitedHitCollector type");
+    // }
+    // } else {
+    // throw new Exception("Unknown HitCollector type");
+    // }
   }
-  
+
   private void showSearchPage() {
     Task<Object> buildTableTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
@@ -497,47 +494,47 @@
       }
     };
 
-      TaskListener<Object> taskListener = new TaskListener<Object>() {
-        @Override
-        public void taskExecuted(Task<Object> task) {
-          try {
+    TaskListener<Object> taskListener = new TaskListener<Object>() {
+      @Override
+      public void taskExecuted(Task<Object> task) {
+        try {
 
-            int resNum = collector.getTotalHits();
-            int max = Math.min(resNum, resStart + resCount);
-            //Object posLabel = find("resPos");
-            //setString(posLabel, "text", resStart + "-" + (max - 1));
-            List<String> fields = indexInfo.getFieldNames();
-            for (int i = 0; i < fields.size(); i++) {
-              String fieldName = fields.get(i);
-              searchResultsTable.getColumns().add(new Column(fieldName, fieldName));
-            }
-            ArrayList<Map<String,String>> tableData = new ArrayList<Map<String,String>>();
-            for (int i = resStart; i < max; i++) {
-              int docid = collector.getDocId(i);
-              float score = collector.getScore(i);
-              createResultRow(i, docid, score, tableData);
-            }
-            searchResultsTable.setTableData(tableData);
-          } catch (Exception e) {
-            e.printStackTrace();
-            // TODO:
-            //showStatus(e.getMessage());
+          int resNum = collector.getTotalHits();
+          int max = Math.min(resNum, resStart + resCount);
+          // Object posLabel = find("resPos");
+          // setString(posLabel, "text", resStart + "-" + (max - 1));
+          List<String> fields = indexInfo.getFieldNames();
+          for (int i = 0; i < fields.size(); i++) {
+            String fieldName = fields.get(i);
+            searchResultsTable.getColumns().add(new Column(fieldName, fieldName));
           }
-          // ai.setActive(false);
-          // lukeWindow.setEnabled(true);
+          ArrayList<Map<String,String>> tableData = new ArrayList<Map<String,String>>();
+          for (int i = resStart; i < max; i++) {
+            int docid = collector.getDocId(i);
+            float score = collector.getScore(i);
+            createResultRow(i, docid, score, tableData);
+          }
+          searchResultsTable.setTableData(tableData);
+        } catch (Exception e) {
+          e.printStackTrace();
+          // TODO:
+          // showStatus(e.getMessage());
         }
-        
-        @Override
-        public void executeFailed(Task<Object> task) {
-          // ai.setActive(false);
-          // lukeWindow.setEnabled(true);
-        }
-      };
-      
-      buildTableTask.execute(new TaskAdapter<Object>(taskListener));
+        // ai.setActive(false);
+        // lukeWindow.setEnabled(true);
+      }
 
+      @Override
+      public void executeFailed(Task<Object> task) {
+        // ai.setActive(false);
+        // lukeWindow.setEnabled(true);
+      }
+    };
+
+    buildTableTask.execute(new TaskAdapter<Object>(taskListener));
+
   }
-  
+
   private void createResultRow(int pos, int docId, float score, ArrayList<Map<String,String>> tableData) throws IOException {
     Map<String,String> row = new HashMap<String,String>();
 
@@ -545,45 +542,46 @@
     row.put("num", String.valueOf(pos));
 
     row.put("score", String.valueOf(df.format(score)));
-  
+
     row.put("docId", String.valueOf(docId));
- 
+
     Document doc = indexInfo.getReader().document(docId);
-    //putProperty(row, "docid", new Integer(docId));
+    // putProperty(row, "docid", new Integer(docId));
     List<String> fields = indexInfo.getFieldNames();
     StringBuilder vals = new StringBuilder();
-    
+
     for (int j = 0; j < fields.size(); j++) {
       String fieldName = fields.get(j);
       Decoder dec = lukeMediator.getDecoders().get(fieldName);
-      if (dec == null) dec = lukeMediator.getDefDecoder();
+      if (dec == null)
+        dec = lukeMediator.getDefDecoder();
       IndexableField[] values = doc.getFields(fieldName);
       vals.setLength(0);
       boolean decodeErr = false;
-      if (values != null) for (int k = 0; k < values.length; k++) {
-        if (k > 0) vals.append(' ');
-        String v;
-        try {
-          v = dec.decodeStored(fieldName, (Field) values[k]);
-        } catch (Throwable e) {
-          e.printStackTrace();
-          v = values[k].stringValue();
-          decodeErr = true;
+      if (values != null)
+        for (int k = 0; k < values.length; k++) {
+          if (k > 0)
+            vals.append(' ');
+          String v;
+          try {
+            v = dec.decodeStored(fieldName, (Field) values[k]);
+          } catch (Throwable e) {
+            e.printStackTrace();
+            v = values[k].stringValue();
+            decodeErr = true;
+          }
+          vals.append(Util.escape(v));
         }
-        vals.append(Util.escape(v));
-      }
       row.put(fieldName, vals.toString());
       if (decodeErr) {
         // TODO:
-        //setColor(cell, "foreground", Color.RED);
+        // setColor(cell, "foreground", Color.RED);
       }
-   
+
     }
   }
 
-  
   private void errorMsg(String error) {
     Alert.alert(MessageType.ERROR, error, lukeMediator.getLukeWindow());
   }
-  
 }
Index: src/org/apache/lucene/luke/ui/DocumentsTab.bxml
===================================================================
--- src/org/apache/lucene/luke/ui/DocumentsTab.bxml	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/DocumentsTab.bxml	(working copy)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<luke:DocumentsTab styles="{verticalSpacing:2,horizontalSpacing:2,padding:4,backgroundColor:11}"
+<luke:DocumentsTab bxml:id="DocumentsTab"
+	styles="{verticalSpacing:2,horizontalSpacing:2,padding:4,backgroundColor:11}"
 	xmlns:bxml="http://pivot.apache.org/bxml" xmlns:content="org.apache.pivot.wtk.content"
 	xmlns="org.apache.pivot.wtk" xmlns:luke="org.apache.lucene.luke.ui">
 
@@ -165,4 +166,4 @@
 			</ScrollPane>
 		</TablePane.Row>
 	</rows>
-</luke:DocumentsTab>
\ No newline at end of file
+</luke:DocumentsTab>
Index: src/org/apache/lucene/luke/ui/LukeApplication.java
===================================================================
--- src/org/apache/lucene/luke/ui/LukeApplication.java	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/LukeApplication.java	(working copy)
@@ -33,43 +33,39 @@
 
 public class LukeApplication implements Application {
   public static final String LANGUAGE_KEY = "language";
-  
+
   LukeWindow lukeWindow = null;
-  
+
   @Override
-  public void startup(Display display, Map<String,String> properties)
-      throws Exception {
+  public void startup(Display display, Map<String,String> properties) throws Exception {
     try {
 
-    String language = properties.get(LANGUAGE_KEY);
-    Locale locale = (language == null) ? Locale.getDefault() : new Locale(
-        language);
-    Resources resources = new Resources(getClass().getName(), locale);
-    
-    Theme theme = Theme.getTheme();
-    Font font = theme.getFont();
-    
-    // Search for a font that can support the sample string
-    String sampleResource = (String) resources.get("sampleText");
-    if (font.canDisplayUpTo(sampleResource) != -1) {
-      Font[] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment()
-          .getAllFonts();
-      
-      for (int i = 0; i < fonts.length; i++) {
-        if (fonts[i].canDisplayUpTo(sampleResource) == -1) {
-          theme.setFont(fonts[i].deriveFont(Font.PLAIN, 12));
-          break;
+      String language = properties.get(LANGUAGE_KEY);
+      Locale locale = (language == null) ? Locale.getDefault() : new Locale(language);
+      Resources resources = new Resources(getClass().getName(), locale);
+
+      Theme theme = Theme.getTheme();
+      Font font = theme.getFont();
+
+      // Search for a font that can support the sample string
+      String sampleResource = (String) resources.get("sampleText");
+      if (font.canDisplayUpTo(sampleResource) != -1) {
+        Font[] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
+
+        for (int i = 0; i < fonts.length; i++) {
+          if (fonts[i].canDisplayUpTo(sampleResource) == -1) {
+            theme.setFont(fonts[i].deriveFont(Font.PLAIN, 12));
+            break;
+          }
         }
       }
-    }
-    
-    BXMLSerializer bxmlSerializer = new BXMLSerializer();
-    
-    lukeWindow = (LukeWindow) bxmlSerializer.readObject(LukeApplication.class,
-        "LukeWindow.bxml", true);
-    
-    lukeWindow.openLukeWindow(display);
-    } catch(Exception e) {
+
+      BXMLSerializer bxmlSerializer = new BXMLSerializer();
+
+      lukeWindow = (LukeWindow) bxmlSerializer.readObject(LukeApplication.class, "LukeWindow.bxml", true);
+
+      lukeWindow.openLukeWindow(display);
+    } catch (Exception e) {
       if (lukeWindow != null) {
         e.printStackTrace();
         Alert.alert(MessageType.ERROR, e.getMessage(), lukeWindow);
@@ -78,22 +74,22 @@
       }
     }
   }
-  
+
   @Override
   public boolean shutdown(boolean optional) {
     if (lukeWindow != null) {
       lukeWindow.close();
     }
-    
+
     return false;
   }
-  
+
   @Override
   public void suspend() {}
-  
+
   @Override
   public void resume() {}
-  
+
   public static void main(String[] args) {
     DesktopApplicationContext.main(LukeApplication.class, args);
   }
Index: src/org/apache/lucene/luke/ui/LukeWindow.java
===================================================================
--- src/org/apache/lucene/luke/ui/LukeWindow.java	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/LukeWindow.java	(working copy)
@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 
+import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -46,20 +47,55 @@
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.util.Version;
 import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.BXMLSerializer;
 import org.apache.pivot.beans.Bindable;
 import org.apache.pivot.collections.Map;
+import org.apache.pivot.serialization.SerializationException;
 import org.apache.pivot.util.Resources;
+import org.apache.pivot.wtk.Action;
 import org.apache.pivot.wtk.Alert;
+import org.apache.pivot.wtk.Border;
+import org.apache.pivot.wtk.BoxPane;
+import org.apache.pivot.wtk.Checkbox;
+import org.apache.pivot.wtk.Component;
+import org.apache.pivot.wtk.ComponentMouseButtonListener;
+import org.apache.pivot.wtk.ComponentMouseListener;
+import org.apache.pivot.wtk.Container;
+import org.apache.pivot.wtk.DesktopApplicationContext;
 import org.apache.pivot.wtk.Display;
+import org.apache.pivot.wtk.FillPane;
+import org.apache.pivot.wtk.FlowPane;
 import org.apache.pivot.wtk.Frame;
+import org.apache.pivot.wtk.GridPane;
+import org.apache.pivot.wtk.ImageView;
+import org.apache.pivot.wtk.Label;
+import org.apache.pivot.wtk.LinkButton;
+import org.apache.pivot.wtk.ListButton;
+import org.apache.pivot.wtk.ListView;
+import org.apache.pivot.wtk.MenuBar;
 import org.apache.pivot.wtk.MessageType;
+import org.apache.pivot.wtk.Mouse.Button;
+import org.apache.pivot.wtk.PushButton;
+import org.apache.pivot.wtk.RadioButton;
+import org.apache.pivot.wtk.ScrollBar;
+import org.apache.pivot.wtk.ScrollPane;
+import org.apache.pivot.wtk.Separator;
+import org.apache.pivot.wtk.SplitPane;
+import org.apache.pivot.wtk.TabPane;
+import org.apache.pivot.wtk.TablePane;
+import org.apache.pivot.wtk.TablePane.Row;
+import org.apache.pivot.wtk.TableView;
+import org.apache.pivot.wtk.TextArea;
+import org.apache.pivot.wtk.TextInput;
+import org.apache.pivot.wtk.Window;
 
 public class LukeWindow extends Frame implements Bindable {
-  
-//  private static final String MSG_READONLY = "FAILED: Read-Only index.";
-//  private static final String MSG_CONV_ERROR = "Some values could not be properly represented in this format. "
-//      + "They are marked in grey and presented as a hex dump.";
-  
+
+  // private static final String MSG_READONLY = "FAILED: Read-Only index.";
+  // private static final String MSG_CONV_ERROR =
+  // "Some values could not be properly represented in this format. "
+  // + "They are marked in grey and presented as a hex dump.";
+
   @BXML
   private LukeInitWindow lukeInitWindow;
   @BXML
@@ -72,35 +108,165 @@
   private OverviewTab overviewTab;
   @BXML
   private AnalyzersTab analyzersTab;
-  
+
   private LukeMediator lukeMediator = new LukeMediator();
-  
+
   private Class[] analyzers = null;
-  private Class[] defaultAnalyzers = { SimpleAnalyzer.class, StandardAnalyzer.class, StopAnalyzer.class,
-      WhitespaceAnalyzer.class };
-  
+  private Class[] defaultAnalyzers = {SimpleAnalyzer.class, StandardAnalyzer.class, StopAnalyzer.class, WhitespaceAnalyzer.class};
+
   private String baseDir;
   private String[] analyzerNames;
 
-  
+  /**
+   * Set of themes given as hexadecimal color codes
+   */
+  private final int[][] themes = { {0xece9d0, 0x000000, 0xf5f4f0, 0x919b9a, 0xb0b0b0, 0xeeeeee, 0xb9b9b9, 0xff8080, 0xc5c5dd}, // default
+      {0xe6e6e6, 0x000000, 0xffffff, 0x909090, 0xb0b0b0, 0xededed, 0xb9b9b9, 0x89899a, 0xc5c5dd}, // gray
+      {0xeeeecc, 0x000000, 0xffffff, 0x999966, 0xb0b096, 0xededcb, 0xcccc99, 0xcc6600, 0xffcc66}, // sandstone
+      {0xf0f0ff, 0x0000a0, 0xffffff, 0x8080ff, 0xb0b0b0, 0xededed, 0xb0b0ff, 0xff0000, 0xfde0e0}, // sky
+      {0x6375d6, 0xffffff, 0x7f8fdd, 0xd6dff5, 0x9caae5, 0x666666, 0x003399, 0xff3333, 0x666666} // navy
+  };
+
+  /**
+   * Listener for coloring buttons when pressed
+   */
+  ComponentMouseButtonListener mouseButtonPressedListener = new ComponentMouseButtonListener() {
+
+    int theme[];
+
+    public boolean mouseUp(Component component, Button button, int x, int y) {
+      theme = themes[getActiveThemeIndex(Window.getActiveWindow())];
+      setComponentColor(component, "backgroundColor", theme[0]);
+      return false;
+    }
+
+    public boolean mouseDown(Component component, Button button, int x, int y) {
+      theme = themes[getActiveThemeIndex(Window.getActiveWindow())];
+      setComponentColor(component, "backgroundColor", theme[6]);
+      return false;
+    }
+
+    public boolean mouseClick(Component component, Button button, int x, int y, int count) {
+      return false;
+    }
+
+  };
+  /**
+   * Listener for coloring buttons when MouseOver event occurs
+   */
+  ComponentMouseListener mouseMoveListener = new ComponentMouseListener() {
+    int theme[];
+
+    public void mouseOver(Component component) {
+      theme = themes[getActiveThemeIndex(Window.getActiveWindow())];
+      setComponentColor(component, "backgroundColor", theme[5]);
+    }
+
+    public void mouseOut(Component component) {
+      theme = themes[getActiveThemeIndex(Window.getActiveWindow())];
+      setComponentColor(component, "backgroundColor", theme[0]);
+    }
+
+    public boolean mouseMove(Component component, int x, int y) {
+      theme = themes[getActiveThemeIndex(Window.getActiveWindow())];
+      setComponentColor(component, "backgroundColor", theme[5]);
+      return false;
+    }
+  };
+
+  /**
+   * Default constructor for populating analyzers and defining actions when themes are selected
+   * 
+   * @throws IOException
+   * @throws ClassNotFoundException
+   */
   public LukeWindow() throws IOException, ClassNotFoundException {
     populateAnalyzers();
+    close();
+    Action.getNamedActions().put("defaulttheme", new Action() {
+      public void perform(Component source) {
+        recColorChange(Window.getActiveWindow(), themes[0]);
+      }
+    });
+    Action.getNamedActions().put("graytheme", new Action() {
+      public void perform(Component source) {
+        recColorChange(Window.getActiveWindow(), themes[1]);
+      }
+    });
+    Action.getNamedActions().put("sandstonetheme", new Action() {
+      public void perform(Component source) {
+        recColorChange(Window.getActiveWindow(), themes[2]);
+      }
+    });
+    Action.getNamedActions().put("skytheme", new Action() {
+      public void perform(Component source) {
+        recColorChange(Window.getActiveWindow(), themes[3]);
+      }
+    });
+    Action.getNamedActions().put("navytheme", new Action() {
+      public void perform(Component source) {
+        recColorChange(Window.getActiveWindow(), themes[4]);
+      }
+    });
   }
-  
+
+  /**
+   * Open the Luke main window, color to default theme and open dialog for index
+   * 
+   * @param display
+   */
   public void openLukeWindow(Display display) {
     open(display, null);
+    recColorChange(Window.getActiveWindow(), themes[0]);
     onOpen();
   }
-  
+
+  /**
+   * Opens the dialog for getting index and color the dialog to default theme
+   */
   public void onOpen() {
     lukeInitWindow.open(this);
+    recColorChange(Window.getActiveWindow(), themes[0]);
   }
-  
+
   /**
+   * Exits the Luke application
+   */
+  public void exitLuke() {
+    DesktopApplicationContext.exit();
+  }
+
+  /**
+   * Convenience method for getting currently active theme
+   * 
+   * @param activeWindow
+   *          Currently active window
+   * @return Index of currently active theme, got from themes[][]
+   */
+  private int getActiveThemeIndex(Window activeWindow) {
+    if (activeWindow == null)
+      return 0;
+    else {
+      String colorHexString = Integer.toHexString(((Color) activeWindow.getStyles().get("backgroundColor")).getRGB()).substring(2);
+      if (colorHexString.equals(Integer.toHexString(themes[1][0])))
+        return 1;
+      else if (colorHexString.equals(Integer.toHexString(themes[2][0])))
+        return 2;
+      else if (colorHexString.equals(Integer.toHexString(themes[3][0])))
+        return 3;
+      else if (colorHexString.equals(Integer.toHexString(themes[4][0])))
+        return 4;
+      else
+        return 0;
+    }
+  }
+
+  /**
    * Populate a combobox with the current list of analyzers.
+   * 
    * @param combo
-   * @throws ClassNotFoundException 
-   * @throws IOException 
+   * @throws ClassNotFoundException
+   * @throws IOException
    */
   public void populateAnalyzers() throws IOException, ClassNotFoundException {
     Class[] an = ClassFinder.getInstantiableSubclasses(Analyzer.class);
@@ -109,7 +275,7 @@
       analyzers = defaultAnalyzers;
     } else {
       HashSet<Class> uniq = new HashSet<Class>(Arrays.asList(an));
-      analyzers = (Class[])uniq.toArray(new Class[uniq.size()]);
+      analyzers = (Class[]) uniq.toArray(new Class[uniq.size()]);
     }
     analyzerNames = new String[analyzers.length];
     for (int i = 0; i < analyzers.length; i++) {
@@ -117,7 +283,7 @@
     }
     Arrays.sort(analyzerNames);
   }
-  
+
   /**
    * Open indicated index and re-initialize all GUI and plugins.
    * 
@@ -124,16 +290,13 @@
    * @param pName
    *          path to index
    * @param force
-   *          if true, and the index is locked, unlock it first. If false, and
-   *          the index is locked, an error will be reported.
+   *          if true, and the index is locked, unlock it first. If false, and the index is locked, an error will be reported.
    * @param readOnly
    *          open in read-only mode, and disallow modifications.
    */
-  public void openIndex(boolean force, String dirImpl, boolean readOnly,
-      boolean ramDir, boolean keepCommits, IndexCommit point, int tiiDivisor) {
+  public void openIndex(boolean force, String dirImpl, boolean readOnly, boolean ramDir, boolean keepCommits, IndexCommit point, int tiiDivisor) {
     String indexPath = lukeInitWindow.indexPath.getText();
     this.indexPath = indexPath;
-    
 
     // removeAll();
     File baseFileDir = new File(indexPath);
@@ -142,16 +305,18 @@
     // statmsg = find("statmsg");
     if (this.directory != null) {
       try {
-        if (indexReader != null) indexReader.close();
+        if (indexReader != null)
+          indexReader.close();
       } catch (Exception e) {}
-      
+
       try {
-        if (directory != null) directory.close();
+        if (directory != null)
+          directory.close();
       } catch (Exception e) {}
     }
     java.util.ArrayList<Directory> dirs = new java.util.ArrayList<Directory>();
     try {
-      Directory d = openDirectory(dirImpl, this.indexPath , false);
+      Directory d = openDirectory(dirImpl, this.indexPath, false);
       if (d == null) {
         return;
       }
@@ -179,7 +344,7 @@
       } catch (Throwable e) {
         e.printStackTrace();
       }
-      
+
       if (!existsSingle) { // try multi
         File[] files = baseFileDir.listFiles();
         for (File f : files) {
@@ -219,22 +384,22 @@
       } else {
         dirs.add(d);
       }
-      
+
       if (dirs.size() == 0) {
         errorMsg("No valid directory at the location, try another location.");
         return;
       }
-      
+
       if (ramDir) {
-        //TODO:
-        //showStatus("Loading index into RAMDirectory ...");
+        // TODO:
+        showStatus("Loading index into RAMDirectory ...");
         Directory dir1 = new RAMDirectory();
         IndexWriterConfig config = new IndexWriterConfig(Version.LUCENE_31, new SimpleAnalyzer(Version.LUCENE_31));
         IndexWriter iw1 = new IndexWriter(dir1, config);
-        iw1.addIndexes((Directory[])dirs.toArray(new Directory[dirs.size()]));
+        iw1.addIndexes((Directory[]) dirs.toArray(new Directory[dirs.size()]));
         iw1.close();
-        //TODO:
-        //showStatus("RAMDirectory loading done!");
+        // TODO:
+        showStatus("RAMDirectory loading done!");
         directory.close();
         directory = dir1;
       }
@@ -251,29 +416,29 @@
       if (readers.size() == 1) {
         indexReader = readers.get(0);
         IndexReader ir = readers.get(0);
-        directory = ((DirectoryReader)ir).directory();
+        directory = ((DirectoryReader) ir).directory();
       } else {
-        indexReader = new MultiReader(
-            (IndexReader[]) readers.toArray(new IndexReader[readers.size()]));
+        indexReader = new MultiReader((IndexReader[]) readers.toArray(new IndexReader[readers.size()]));
       }
-      
+
       lukeMediator.indexInfo = new IndexInfo(indexReader, this.indexPath);
-      
- // TODO:
-//      Collection<String> fieldNames = indexReader.getFieldNames(IndexReader.FieldOption.ALL);
-//      
-//      if (fieldNames.size() == 0) {
-//        // showStatus("Empty index.");
-//      }   
-      
+
+      // TODO:
+      // Collection<String> fieldNames =
+      // indexReader.getFieldNames(IndexReader.FieldOption.ALL);
+      //
+      // if (fieldNames.size() == 0) {
+      // // showStatus("Empty index.");
+      // }
+
       // call onOpenIndex for all tabs
       overviewTab.onOpenIndex();
       documentsTab.onOpenIndex();
       searchTab.onOpenIndex();
       filesTab.onOpenIndex();
-      
+
       // initPlugins();
-      // showStatus("Index successfully open.");
+      showStatus("Index successfully open.");
     } catch (Exception e) {
       e.printStackTrace();
       errorMsg(e.getMessage());
@@ -280,9 +445,8 @@
       return;
     }
   }
-  
-  public FSDirectory openDirectory(String dirImpl, String file, boolean create)
-      throws Exception {
+
+  public FSDirectory openDirectory(String dirImpl, String file, boolean create) throws Exception {
     File f = new File(file);
     if (!f.exists()) {
       errorMsg("Index directory doesn't exist.");
@@ -289,8 +453,7 @@
       return null;
     }
     FSDirectory res = null;
-    if (dirImpl == null || dirImpl.equals(FSDirectory.class.getName())
-        || dirImpl.equals(FSDirectory.class.getSimpleName())) {
+    if (dirImpl == null || dirImpl.equals(FSDirectory.class.getName()) || dirImpl.equals(FSDirectory.class.getSimpleName())) {
       return FSDirectory.open(f);
     }
     try {
@@ -301,11 +464,12 @@
       errorMsg("Invalid directory implementation class: " + dirImpl);
       throw new RuntimeException(e);
     }
-    if (res != null) return res;
+    if (res != null)
+      return res;
     // fall-back to FSDirectory.
     return FSDirectory.open(f);
   }
-  
+
   public void showCommitFiles(Object commitTable) throws Exception {
     // List commits = new ArrayList();
     // Object[] rows = getSelectedItems(commitTable);
@@ -321,14 +485,185 @@
     // }
     // showFiles(directory, commits);
   }
-  
+
+  /**
+   * Shows an alert dialog with an error message
+   * 
+   * @param error
+   *          Error message
+   */
   private void errorMsg(String error) {
     Alert.alert(MessageType.ERROR, error, this);
   }
-  
+
+  /**
+   * Shows a message on status bar
+   * 
+   * @param message
+   *          Message to display on status bar
+   * @throws SerializationException
+   * @throws IOException
+   */
+  protected void showStatus(String message) throws IOException, SerializationException {
+    // BXMLSerializer bxmlSerializer = new BXMLSerializer();
+    // Window window = (Window) bxmlSerializer.readObject(LukeWindow.class, "LukeWindow.bxml");
+    // Label label = (Label) bxmlSerializer.getNamespace().get("statusLabel");
+    // label.setTextOrEmpty(message);
+  }
+
+  /**
+   * Convenience method for coloring component
+   * 
+   * @param component
+   *          component to color
+   * @param style
+   *          style to apply (Example : color, backgroundColor)
+   * @param colorRGB
+   *          color code passed as hexadecimal integer
+   * 
+   */
+  private void setComponentColor(Component component, String style, int colorRGB) {
+    Color color = Color.decode(Integer.toString(colorRGB));
+    component.getStyles().put(style, color);
+  }
+
+  /**
+   * Method for recursively coloring all components. If a component is a container, all children are obtained and styles set to get that theme
+   * 
+   * @param component
+   *          component to color and get children
+   * @param theme
+   *          theme, passed as array of hexadecimal represented integer color codes
+   */
+  private void recColorChange(Component component, int[] theme) {
+    if (component instanceof Window) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      for (int i = 0; i < ((Container) component).getLength(); i++) {
+        recColorChange(((Window) component).get(i), theme);
+      }
+    } else if (component instanceof TabPane) {
+      setComponentColor(component, "activeTabColor", theme[0]);
+      setComponentColor(component, "backgroundColor", theme[0]);
+      setComponentColor(component, "inactiveTabColor", theme[0]);
+      setComponentColor(component, "buttonColor", theme[1]);
+      setComponentColor(component, "borderColor", theme[3]);
+      setComponentColor(component, "inactiveBorderColor", theme[3]);
+      for (Component tab : ((TabPane) component).getTabs()) {
+        recColorChange(tab, theme);
+      }
+    } else if (component instanceof Border) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      component = ((Border) component).getContent();
+      recColorChange(component, theme);
+    } else if (component instanceof Label) {
+      setComponentColor(component, "color", theme[1]);
+      setComponentColor(component, "backgroundColor", theme[0]);
+    } else if (component instanceof MenuBar) {
+      setComponentColor(component, "color", theme[1]);
+      setComponentColor(component, "backgroundColor", theme[0]);
+      setComponentColor(component, "activeBackgroundColor", theme[6]);
+    } else if (component instanceof TextInput || component instanceof TextArea) {
+      setComponentColor(component, "color", theme[1]);
+      setComponentColor(component, "backgroundColor", theme[2]);
+      setComponentColor(component, "borderColor", theme[3]);
+      setComponentColor(component, "activeBackgroundColor", theme[6]);
+      setComponentColor(component, "selectionBackgroundColor", theme[8]);
+      setComponentColor(component, "inactiveSelectionBackgroundColor", theme[8]);
+    } else if (component instanceof TableView) {
+      setComponentColor(component, "color", theme[1]);
+      setComponentColor(component, "backgroundColor", theme[2]);
+      setComponentColor(component, "alternateRowBackgroundColor", theme[2]);
+      setComponentColor(component, "horizontalGridColor", theme[3]);
+      setComponentColor(component, "verticalGridColor", theme[3]);
+      setComponentColor(component, "inactiveSelectionBackgroundColor", theme[8]);
+      setComponentColor(component, "selectionBackgroundColor", theme[8]);
+      setComponentColor(component, "highlightBackgroundColor", theme[8]);
+    } else if (component instanceof TablePane) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      setComponentColor(component, "horizontalGridColor", theme[3]);
+      setComponentColor(component, "verticalGridColor", theme[3]);
+      for (Row row : ((TablePane) component).getRows()) {
+        for (int i = 0; i < row.getLength(); i++) {
+          recColorChange(row.get(i), theme);
+        }
+      }
+    } else if (component instanceof Separator) {
+      setComponentColor(component, "color", theme[0]);
+      setComponentColor(component, "headingColor", theme[1]);
+    } else if (component instanceof ListView) {
+      setComponentColor(component, "color", theme[1]);
+      setComponentColor(component, "backgroundColor", theme[2]);
+      setComponentColor(component, "selectionBackgroundColor", theme[8]);
+      setComponentColor(component, "inactiveSelectionBackgroundColor", theme[8]);
+      setComponentColor(component, "highlightBackgroundColor", theme[8]);
+    } else if (component.toString().startsWith("org.apache.lucene.luke.ui")) {
+      if (component.toString().endsWith("OverviewTab"))
+        component = (Container) new BXMLSerializer().getNamespace().get("OverviewTab");
+      else if (component.toString().endsWith("AnalyzersTab"))
+        component = (Container) new BXMLSerializer().getNamespace().get("AnalyzersTab");
+      else if (component.toString().endsWith("DocumentsTab"))
+        component = (Container) new BXMLSerializer().getNamespace().get("DocumentsTab");
+      else if (component.toString().endsWith("SearchTab"))
+        component = (Container) new BXMLSerializer().getNamespace().get("SearchTab");
+      else if (component.toString().endsWith("FilesTab"))
+        component = (Container) new BXMLSerializer().getNamespace().get("FilesTab");
+
+    } else if (component instanceof SplitPane) {
+      if (((SplitPane) component).getLeft() != null) {
+        recColorChange(((SplitPane) component).getLeft(), theme);
+        recColorChange(((SplitPane) component).getRight(), theme);
+      } else {
+        System.out.println("TOP of : " + component.getParent());
+        recColorChange(((SplitPane) component).getTop(), theme);
+        recColorChange(((SplitPane) component).getBottom(), theme);
+      }
+    } else if (component instanceof ScrollBar) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      setComponentColor(component, "scrollButtonBackgroundColor", theme[2]);
+      setComponentColor(component, "borderColor", theme[3]);
+    } else if (component instanceof PushButton || component instanceof ListButton) {
+      component.getComponentMouseButtonListeners().add(mouseButtonPressedListener);
+      component.getComponentMouseListeners().add(mouseMoveListener);
+      setComponentColor(component, "color", theme[1]);
+      setComponentColor(component, "backgroundColor", theme[0]);
+      setComponentColor(component, "borderColor", theme[3]);
+    } else if (component instanceof RadioButton || component instanceof Checkbox || component instanceof LinkButton) {
+      setComponentColor(component, "color", theme[1]);
+    } else if (component instanceof ScrollPane) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      for (int i = 0; i < ((ScrollPane) component).getLength(); i++) {
+        recColorChange(((ScrollPane) component).get(i), theme);
+      }
+    } else if (component instanceof FlowPane) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      for (int i = 0; i < ((FlowPane) component).getLength(); i++) {
+        recColorChange(((FlowPane) component).get(i), theme);
+      }
+    } else if (component instanceof BoxPane) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      for (int i = 0; i < ((BoxPane) component).getLength(); i++) {
+        recColorChange(((BoxPane) component).get(i), theme);
+      }
+    } else if (component instanceof GridPane) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      for (int i = 0; i < ((GridPane) component).getLength(); i++) {
+        recColorChange(((GridPane) component).get(i), theme);
+      }
+    } else if (component instanceof FillPane) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+      for (int i = 0; i < ((FillPane) component).getLength(); i++) {
+        recColorChange(((FillPane) component).get(i), theme);
+      }
+    } else if (component instanceof ScrollPane.Corner) {
+      setComponentColor(component, "backgroundColor", theme[0]);
+    } else if (!(component instanceof ImageView)) {
+      setComponentColor(component, "color", theme[1]);
+      setComponentColor(component, "backgroundColor", theme[0]);
+    }
+  }
+
   @Override
-  public void initialize(Map<String,Object> namespace, URL location,
-      Resources resources) {
+  public void initialize(Map<String,Object> namespace, URL location, Resources resources) {
     documentsTab.initLukeMediator(lukeMediator);
     overviewTab.initLukeMediator(lukeMediator);
     filesTab.initLukeMediator(lukeMediator);
@@ -336,7 +671,7 @@
     analyzersTab.initLukeMediator(lukeMediator);
     lukeInitWindow.initLukeMediator(lukeMediator);
   }
-  
+
   private IndexReader indexReader;
   private java.util.Map<String,Decoder> decoders = new HashMap<String,Decoder>();
   private Decoder defDecoder = new StringDecoder();
@@ -343,7 +678,7 @@
   private String indexPath;
 
   private Directory directory;
-  
+
   class LukeMediator {
 
     // populated by LukeWindow#openIndex
@@ -360,18 +695,18 @@
     public Decoder getDefDecoder() {
       return defDecoder;
     }
-    
+
     public OverviewTab getOverViewTab() {
       return overviewTab;
     }
-    
+
     public LukeWindow getLukeWindow() {
       return LukeWindow.this;
     }
-    
+
     public String[] getAnalyzerNames() {
       return analyzerNames;
     }
   }
 
-}
\ No newline at end of file
+}
Index: src/org/apache/lucene/luke/ui/FilesTab.java
===================================================================
--- src/org/apache/lucene/luke/ui/FilesTab.java	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/FilesTab.java	(working copy)
@@ -23,13 +23,11 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Iterator;
 
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexCommit;
 import org.apache.lucene.index.IndexGate;
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.luke.core.IndexInfo;
 import org.apache.lucene.luke.core.Util;
 import org.apache.lucene.luke.ui.LukeWindow.LukeMediator;
Index: src/org/apache/lucene/luke/ui/OverviewTab.java
===================================================================
--- src/org/apache/lucene/luke/ui/OverviewTab.java	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/OverviewTab.java	(working copy)
@@ -62,7 +62,7 @@
 import org.apache.pivot.wtk.TaskAdapter;
 
 public class OverviewTab extends SplitPane implements Bindable {
-  
+
   @BXML
   private Label iPath;
   @BXML
@@ -79,13 +79,13 @@
   private TableView fieldsTable;
   @BXML
   private Label iTerms;
-  
+
   @BXML
   private TablePane.Row fieldsAiRow;
-  
+
   @BXML
   private TablePane.Row iTermsRow;
-  
+
   @BXML
   private Label iFormat;
   @BXML
@@ -106,15 +106,15 @@
   private TableView tTable;
   @BXML
   private TablePane.Row topTermsAiRow;
-  
+
   private java.util.Map<String,FieldTermCount> termCounts = new java.util.HashMap<String,FieldTermCount>();
   private int numTerms = 0;
-  
+
   private LukeMediator lukeMediator;
   private Resources resources;
   private IndexReader ir;
   private IndexInfo indexInfo;
-  
+
   public OverviewTab() {
     Action.getNamedActions().put("topTerms", new Action() {
       @Override
@@ -123,19 +123,18 @@
       }
     });
   }
-  
+
   @Override
-  public void initialize(Map<String,Object> namespace, URL location,
-      Resources resources) {
+  public void initialize(Map<String,Object> namespace, URL location, Resources resources) {
     this.resources = resources;
-    
+
   }
-  
+
   public void initLukeMediator(LukeMediator lukeMediator) {
     this.lukeMediator = lukeMediator;
 
   }
-  
+
   /**
    * Initialize GUI elements. This method is called when a new index is opened.
    * 
@@ -144,11 +143,11 @@
   public void onOpenIndex() throws Exception {
     this.indexInfo = lukeMediator.getIndexInfo();
     this.ir = indexInfo.getReader();
-    
+
     String indexPath = indexInfo.getIndexPath();
     try {
       // initSolrTypes();
-      
+
       // lastST = find("lastST");
       // setBoolean(find("bReload"), "enabled", true);
       // setBoolean(find("bClose"), "enabled", true);
@@ -156,20 +155,18 @@
       // Object cbType = find("cbType");
       // populateAnalyzers(cbType);
       // Object pOver = find("pOver");
-      
+
       String idxName;
       if (indexPath.length() > 40) {
-        idxName = indexPath.substring(0, 10) + "..."
-            + indexPath.substring(indexPath.length() - 27);
+        idxName = indexPath.substring(0, 10) + "..." + indexPath.substring(indexPath.length() - 27);
       } else {
         idxName = indexPath;
       }
-      
-      iPath.setText(indexPath
-          + (lukeMediator.getIndexInfo().isReadOnly() ? " (Read-Only)" : ""));
-      
+
+      iPath.setText(indexPath + (lukeMediator.getIndexInfo().isReadOnly() ? " (Read-Only)" : ""));
+
       // happens lower in the commented out code - future note
-      
+
       String implName = "N/A";
       Directory dir = lukeMediator.getIndexInfo().getDirectory();
       if (dir == null) {
@@ -180,7 +177,7 @@
         implName = dir.getClass().getName();
       }
       dirImpl.setText(implName);
-      
+
       // Label iFileSize = (Label) beanSerializer.get("iFileSize");
       // long totalFileSize = Util.calcTotalFileSize(pName, dir);
       // iFileSize.setText(Util.normalizeSize(totalFileSize) +
@@ -189,10 +186,10 @@
         return;
       }
       // we need IndexReader from now on
-      
+
       // TODO: Codecs are now per field...
       // indexCodec.setText(lukeMediator.getIndexInfo().getIndexCodec().getName());
-      
+
       // String modText = "N/A";
       // if (dir != null) {
       // modText = new Date(IndexReader.lastModified(dir))
@@ -199,43 +196,43 @@
       // .toString();
       // }
       // iMod.setText(modText);
-      
+
       String numdocs = String.valueOf(ir.numDocs());
       iDocs.setText(numdocs);
-      
+
       // TODO
       // Label iDocs1 = (Label) beanSerializer.get("iDocs1");
       // iDocs1.setText(String.valueOf(ir.maxDoc() - 1));
-      
+
       java.util.List<String> indexFields = indexInfo.getFieldNames();
       iFields.setText(String.valueOf(indexFields.size()));
       // if (fn.size() == 0) {
       // showStatus("Empty index.");
       // }
-      
+
       // Label defFld = (Label) beanSerializer.get("defFld");
       // Label fCombo = (Label) beanSerializer.get("fCombo");
-      
+
       iFields.setText(String.valueOf(indexFields.size()));
-      
+
       final ActivityIndicator ai = new ActivityIndicator();
       ai.setStyles("{backgroundColor:11}");
       ai.setPreferredHeight(10);
       ai.setPreferredWidth(10);
       ai.setActive(true);
-      
+
       fieldsAiRow.add(ai);
-      
+
       iTermsRow.remove(iTerms);
-      
+
       final ActivityIndicator iTermsAi = new ActivityIndicator();
       iTermsAi.setStyles("{backgroundColor:'#fcfdfd'}");
       iTermsAi.setPreferredHeight(10);
       iTermsAi.setPreferredWidth(10);
-      
+
       iTermsAi.setActive(true);
       iTermsRow.add(iTermsAi);
-      
+
       TaskListener<String> taskListener = new TaskListener<String>() {
         @Override
         public void taskExecuted(Task<String> task) {
@@ -245,19 +242,19 @@
           termCounts.clear();
           FieldTermCount ftc = null;
           try {
-            
+
             numTerms = indexInfo.getNumTerms();
             termCounts = indexInfo.getFieldTermCounts();
-            
+
             iTerms.setText(String.valueOf(numTerms));
             initFieldList(null, null);
-            
+
           } catch (Exception e) {
             // showStatus("ERROR: can't count terms per field");
             numTerms = -1;
             termCounts = Collections.emptyMap();
           }
-          
+
           ai.setActive(false);
           iTermsAi.setActive(false);
           fieldsAiRow.remove(ai);
@@ -265,7 +262,7 @@
           iTermsRow.add(iTerms);
           // lukeWindow.setEnabled(true);
         }
-        
+
         @Override
         public void executeFailed(Task<String> task) {
           ai.setActive(false);
@@ -274,66 +271,58 @@
         }
       };
       Task fListTask = new Task() {
-        
+
         @Override
         public Object execute() throws TaskExecutionException {
           return null;
         }
       };
-      
+
       fListTask.execute(new TaskAdapter<String>(taskListener));
-      
-      String sDel = ir.hasDeletions() ? "Yes (" + ir.numDeletedDocs() + ")"
-          : "No";
-      IndexCommit ic = ir instanceof DirectoryReader ? ((DirectoryReader) ir)
-          .getIndexCommit() : null;
-      String sDelOpt = ic != null ? (ic.getSegmentCount() == 1 ? "Yes" : "No")
-          : "?";
+
+      String sDel = ir.hasDeletions() ? "Yes (" + ir.numDeletedDocs() + ")" : "No";
+      IndexCommit ic = ir instanceof DirectoryReader ? ((DirectoryReader) ir).getIndexCommit() : null;
+      String sDelOpt = ic != null ? (ic.getSegmentCount() == 1 ? "Yes" : "No") : "?";
       iDelOpt.setText(sDelOpt);
-      
+
       String verText = "N/A";
       if (ic != null) {
         verText = Long.toHexString(((DirectoryReader) ir).getVersion());
       }
       iVer.setText(verText);
-      
+
       String formatText = "N/A";
       String formatCaps = "N/A";
       if (dir != null) {
         int format = IndexGate.getIndexFormat(dir);
-        IndexGate.FormatDetails formatDetails = IndexGate
-            .getFormatDetails(format);
+        IndexGate.FormatDetails formatDetails = IndexGate.getFormatDetails(format);
         formatText = format + " (" + formatDetails.genericName + ")";
         formatCaps = formatDetails.capabilities;
         if (formatCaps == null) {
-          formatCaps = (String) resources
-              .get("overviewTab_newerVersionWarning");
+          formatCaps = (String) resources.get("overviewTab_newerVersionWarning");
         }
       }
       iFormat.setText(formatText);
       iCaps.setText(formatCaps);
-      
+
       String divText = "N/A";
-      
+
       if (ir instanceof DirectoryReader) {
-        java.util.List<AtomicReaderContext> readers = ((DirectoryReader) ir)
-            .leaves();
+        java.util.List<AtomicReaderContext> readers = ((DirectoryReader) ir).leaves();
         if (readers.size() > 0) {
           if (readers.get(0).reader() instanceof SegmentReader) {
-            divText = String.valueOf(((SegmentReader) readers.get(0).reader())
-                .getTermInfosIndexDivisor());
+            divText = String.valueOf(((SegmentReader) readers.get(0).reader()).getTermInfosIndexDivisor());
           }
         }
       }
       iTiiDiv.setText(divText);
-      
+
       String commitText = "N/A";
       try {
-        commitText = ic.getSegmentsFileName() + " (generation="
-            + ic.getGeneration() + ", segs=" + ic.getSegmentCount() + ")";
+        commitText = ic.getSegmentsFileName() + " (generation=" + ic.getGeneration() + ", segs=" + ic.getSegmentCount() + ")";
       } catch (UnsupportedOperationException uoe) {}
       iCommit.setText(commitText);
-      
+
       String userData = null;
       try {
         java.util.Map<String,String> userDataMap = ic.getUserData();
@@ -347,15 +336,15 @@
       }
       iUser.setText(userData);
       final int nTermsInt = getNTerms();
-      
+
       actionTopTerms(nTermsInt);
-      
+
     } catch (Exception e) {
       e.printStackTrace();
       errorMsg(e.getMessage());
     }
   }
-  
+
   /**
    * Update the list of top terms.
    */
@@ -364,13 +353,13 @@
       // showStatus(MSG_NOINDEX);
       return;
     }
-    
+
     int nd = nTerms;
-    
+
     final int ndoc = nd;
-    
+
     Sequence<?> fields = fieldsTable.getSelectedRows();
-    
+
     String[] flds = null;
     if (fields == null || fields.getLength() == 0) {
       flds = indexInfo.getFieldNames().toArray(new String[0]);
@@ -381,9 +370,9 @@
       }
     }
     final String[] fflds = flds;
-    
+
     tTable.setTableData(new ArrayList(0));
-    
+
     final ActivityIndicator ai = new ActivityIndicator();
     try {
       ai.setStyles("{backgroundColor:11}");
@@ -394,52 +383,51 @@
     ai.setPreferredWidth(10);
     ai.setHeight(10);
     ai.setWidth(10);
-    
+
     topTermsAiRow.add(ai);
     ai.setActive(true);
-    
+
     Task<Object> topTermsTask = new Task<Object>() {
-      
+
       @Override
       public Object execute() throws TaskExecutionException {
         return null;
       }
     };
-    
+
     TaskListener<Object> taskListener = new TaskListener<Object>() {
       @Override
       public void taskExecuted(Task<Object> task) {
         // this must happen here rather than in the task because it must happen in the UI dispatch thread
         try {
-          TermStats[] topTerms = HighFreqTerms
-              .getHighFreqTerms(ir, ndoc, fflds);
-          
+          TermStats[] topTerms = HighFreqTerms.getHighFreqTerms(ir, ndoc, fflds);
+
           List<Map<String,String>> tableData = new ArrayList<Map<String,String>>();
-          
+
           if (topTerms == null || topTerms.length == 0) {
             Map<String,String> row = new HashMap<String,String>();
             row.put("text", "No Results");
             tableData.add(row);
           }
-          
+
           for (int i = 0; i < topTerms.length; i++) {
             Map<String,String> row = new HashMap<String,String>();
-            
+
             // putProperty(row, "term", tis[i].term);
             // putProperty(row, "ti", tis[i]);
-            
+
             row.put("num", String.valueOf(i + 1));
-            
+
             row.put("df", String.valueOf(topTerms[i].docFreq) + "  ");
-            
+
             row.put("field", topTerms[i].field);
-            
+
             Decoder dec = lukeMediator.getDecoders().get(topTerms[i].field);
-            if (dec == null) dec = lukeMediator.getDefDecoder();
+            if (dec == null)
+              dec = lukeMediator.getDefDecoder();
             String s;
             try {
-              s = dec.decodeTerm(topTerms[i].field,
-                  topTerms[i].termtext.utf8ToString());
+              s = dec.decodeTerm(topTerms[i].field, topTerms[i].termtext.utf8ToString());
             } catch (Throwable e) {
               // e.printStackTrace();
               s = topTerms[i].termtext.utf8ToString();
@@ -455,12 +443,11 @@
           e.printStackTrace();
           errorMsg(e.getMessage());
         }
-      
-        
+
         ai.setActive(false);
         // lukeWindow.setEnabled(true);
       }
-      
+
       @Override
       public void executeFailed(Task<Object> task) {
         ai.setActive(false);
@@ -467,10 +454,10 @@
         // lukeWindow.setEnabled(true);
       }
     };
-    
+
     topTermsTask.execute(new TaskAdapter<Object>(taskListener));
   }
-  
+
   private void initFieldList(Object fCombo, Object defFld) {
     // removeAll(fieldsTable);
     // removeAll(defFld);
@@ -484,62 +471,62 @@
     final List<Map<String,String>> tableData = new ArrayList<Map<String,String>>();
     tableData.setComparator(new TableComparator(fieldsTable));
 
-    fieldsTable.getTableViewSortListeners().add(new TableViewSortListener(){
+    fieldsTable.getTableViewSortListeners().add(new TableViewSortListener() {
 
       @Override
       public void sortAdded(TableView tableView, String columnName) {
         tableView.setSort(columnName, SortDirection.ASCENDING);
-        
+
       }
 
       @Override
-      public void sortUpdated(TableView tableView, String columnName,
-          SortDirection previousSortDirection) {
-        tableView.setSort(columnName, previousSortDirection == SortDirection.ASCENDING ? SortDirection.DESCENDING: SortDirection.ASCENDING);
-        
+      public void sortUpdated(TableView tableView, String columnName, SortDirection previousSortDirection) {
+        tableView.setSort(columnName, previousSortDirection == SortDirection.ASCENDING ? SortDirection.DESCENDING : SortDirection.ASCENDING);
+
       }
 
       @Override
-      public void sortRemoved(TableView tableView, String columnName,
-          SortDirection sortDirection) {
+      public void sortRemoved(TableView tableView, String columnName, SortDirection sortDirection) {
         // TODO Auto-generated method stub
       }
 
       @Override
       public void sortChanged(TableView tableView) {
-        //tableData.setComparator(new TableComparator(tableView));
-        
-      }});
-    
-    fieldsTable.setSort("name", SortDirection.ASCENDING); 
-   
+        // tableData.setComparator(new TableComparator(tableView));
+
+      }
+    });
+
+    fieldsTable.setSort("name", SortDirection.ASCENDING);
+
     for (String s : indexInfo.getFieldNames()) {
       Map<String,String> row = new HashMap<String,String>();
-      
+
       row.put("name", s);
-      
+
       FieldTermCount ftc = termCounts.get(s);
       if (ftc != null) {
         long cnt = ftc.termCount;
-        
+
         row.put("termCount", intCountFormat.format(cnt));
-        
+
         float pcent = (float) (cnt * 100) / (float) numTerms;
-        
+
         row.put("percent", percentFormat.format(pcent) + " %");
-        
+
       } else {
         row.put("termCount", "0");
         row.put("percent", "0.00%");
       }
-      
+
       tableData.add(row);
-      
+
       Decoder dec = lukeMediator.getDecoders().get(s);
-      if (dec == null) dec = lukeMediator.getDefDecoder();
+      if (dec == null)
+        dec = lukeMediator.getDefDecoder();
       row.put("decoder", dec.toString());
-      
-      // // populate combos
+
+      // populate combos
       // Object choice = create("choice");
       // add(fCombo, choice);
       // setString(choice, "text", s);
@@ -550,15 +537,14 @@
       // putProperty(choice, "fName", s);
     }
     fieldsTable.setTableData(tableData);
-    
+
   }
-  
+
   private int getNTerms() {
-    
     final int nTermsInt = nTerms.getSelectedIndex();
     return nTermsInt;
   }
-  
+
   private void errorMsg(String error) {
     Alert.alert(MessageType.ERROR, error, getWindow());
   }
Index: src/org/apache/lucene/luke/ui/AnalyzersTab.java
===================================================================
--- src/org/apache/lucene/luke/ui/AnalyzersTab.java	(revision 0)
+++ src/org/apache/lucene/luke/ui/AnalyzersTab.java	(working copy)
@@ -1,231 +0,0 @@
-package org.apache.lucene.luke.ui;
-
-import java.io.StringReader;
-import java.lang.reflect.Constructor;
-import java.net.URL;
-import java.util.Iterator;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;
-import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
-import org.apache.lucene.luke.core.Util;
-import org.apache.lucene.luke.ui.LukeWindow.LukeMediator;
-import org.apache.lucene.util.Attribute;
-import org.apache.lucene.util.AttributeSource;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.Version;
-import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.Bindable;
-import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.HashMap;
-import org.apache.pivot.collections.List;
-import org.apache.pivot.collections.Map;
-import org.apache.pivot.collections.Sequence;
-import org.apache.pivot.util.Resources;
-import org.apache.pivot.wtk.Action;
-import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.ListButton;
-import org.apache.pivot.wtk.ListView;
-import org.apache.pivot.wtk.ListView.SelectMode;
-import org.apache.pivot.wtk.ListViewSelectionListener;
-import org.apache.pivot.wtk.Span;
-import org.apache.pivot.wtk.TablePane;
-import org.apache.pivot.wtk.TableView;
-import org.apache.pivot.wtk.TextArea;
-
-public class AnalyzersTab extends TablePane implements Bindable {
-  
-  @BXML
-  private ListButton analyzersListButton;
-  @BXML
-  private ListButton luceneVersionListButton;
-  @BXML
-  private TextArea inputText;
-  @BXML
-  private TableView tokenAttsTable;
-  @BXML
-  private ListView resultsList;
-  
-  private Map<Integer,AttributeSource> attribs;
-  
-  public AnalyzersTab() {
-    Action.getNamedActions().put("analyze", new Action() {
-      @Override
-      public void perform(Component component) {
-        analyze();
-      }
-    });
-  }
-  
-  public void initLukeMediator(LukeMediator lukeMediator) {
-    
-    analyzersListButton.setListData(new ArrayList<String>(lukeMediator
-        .getAnalyzerNames()));
-    analyzersListButton.setSelectedIndex(0);
-    List<String> versions = new ArrayList<String>();
-    Version[] values = Version.values();
-    for (int i = 0; i < values.length; i++) {
-      Version v = values[i];
-      versions.add(v.toString());
-    }
-    luceneVersionListButton.setListData(versions);
-    luceneVersionListButton.setSelectedItem("LUCENE_CURRENT");
-  }
-  
-  @Override
-  public void initialize(Map<String,Object> namespace, URL location,
-      Resources resources) {
-    resultsList.setSelectMode(SelectMode.SINGLE);
-    resultsList.getListViewSelectionListeners().add(
-        new ListViewSelectionListener() {
-          
-          @Override
-          public void selectedRangesChanged(ListView listView,
-              Sequence<Span> previousSelectedRanges) {
-            // TODO Auto-generated method stub
-            
-          }
-          
-          @Override
-          public void selectedRangeRemoved(ListView listView, int rangeStart,
-              int rangeEnd) {
-            // TODO Auto-generated method stub
-            
-          }
-          
-          @Override
-          public void selectedRangeAdded(ListView listView, int rangeStart,
-              int rangeEnd) {
-            // TODO Auto-generated method stub
-            
-          }
-          
-          @Override
-          public void selectedItemChanged(ListView listView,
-              Object previousSelectedItem) {
-            tokenChange();
-            
-          }
-        });
-  }
-  
-  public void analyze() {
-    try {
-      Version v = Version.valueOf((String) luceneVersionListButton
-          .getSelectedItem());
-      Class clazz = Class.forName((String) analyzersListButton
-          .getSelectedItem());
-      Analyzer analyzer = null;
-      try {
-        Constructor<Analyzer> c = clazz.getConstructor(Version.class);
-        analyzer = c.newInstance(v);
-      } catch (Throwable t) {
-        try {
-          // no constructor with Version ?
-          analyzer = (Analyzer) clazz.newInstance();
-        } catch (Throwable t1) {
-          t1.printStackTrace();
-          // TODO:
-          // app
-          // .showStatus("Couldn't instantiate analyzer - public 0-arg or 1-arg constructor(Version) required");
-          return;
-        }
-      }
-      attribs = new HashMap<Integer,AttributeSource>();
-      TokenStream ts = analyzer.tokenStream("text",
-          new StringReader(inputText.getText()));
-      List<String> listData = new ArrayList<String>();
-      int cnt = 0;
-      while (ts.incrementToken()) {
-        
-        listData.add(((CharTermAttribute) ts
-            .getAttribute(CharTermAttribute.class)).toString());
-        
-        attribs.put(cnt, ts.cloneAttributes());
-        cnt++;
-      }
-      
-      resultsList.setListData(listData);
-      
-    } catch (Throwable t) {
-      t.printStackTrace();
-      // TODO:
-      // app.showStatus("Error analyzing:" + t.getMessage());
-    }
-    tokenChange();
-  }
-  
-  public void tokenChange() {
-    int selectedIndex = resultsList.getSelectedIndex();
-    if (selectedIndex == -1) {
-      return;
-    }
-    AttributeSource attribSource = attribs.get(selectedIndex);
-    if (attribSource == null) {
-      return;
-    }
-    Iterator it = attribSource.getAttributeClassesIterator();
-    ArrayList<Map<String,String>> tableData = new ArrayList<Map<String,String>>();
-    
-    tokenAttsTable.setTableData(tableData);
-    while (it.hasNext()) {
-      Class cl = (Class) it.next();
-      String attClass = cl.getName();
-      if (attClass.startsWith("org.apache.lucene.")) {
-        attClass = cl.getSimpleName();
-      }
-      Attribute att = attribSource.getAttribute(cl);
-      String implClass = att.getClass().getName();
-      if (implClass.startsWith("org.apache.lucene.")) {
-        implClass = att.getClass().getSimpleName();
-      }
-      
-      Map<String,String> row = new HashMap<String,String>();
-      
-      tableData.add(row);
-      
-      row.put("class", attClass);
-      row.put("impl", implClass);
-      
-      String val = null;
-      if (attClass.equals("CharTermAttribute")) {
-        val = ((CharTermAttribute) att).toString();
-      } else if (attClass.equals("FlagsAttribute")) {
-        val = Integer.toHexString(((FlagsAttribute) att).getFlags());
-      } else if (attClass.equals("OffsetAttribute")) {
-        OffsetAttribute off = (OffsetAttribute) att;
-        val = off.startOffset() + "," + off.endOffset();
-      } else if (attClass.equals("PayloadAttribute")) {
-        BytesRef payload = ((PayloadAttribute) att).getPayload();
-        if (payload != null) {
-          byte[] data = payload.bytes;
-          val = Util.bytesToHex(data, 0, data.length, false);
-        } else {
-          val = "";
-        }
-      } else if (attClass.equals("PositionIncrementAttribute")) {
-        val = ((PositionIncrementAttribute) att).getPositionIncrement() + "";
-      } else if (attClass.equals("TypeAttribute")) {
-        val = ((TypeAttribute) att).type();
-      } else {
-        val = att.toString();
-      }
-      row.put("value", val);
-    }
-    
-    if (attribSource.hasAttribute(OffsetAttribute.class)) {
-      OffsetAttribute off = (OffsetAttribute) attribSource
-          .getAttribute(OffsetAttribute.class);
-      
-      inputText.setSelection(off.startOffset(),
-          off.endOffset() - off.startOffset());
-      inputText.requestFocus();
-    }
-  }
-  
-}
Index: src/org/apache/lucene/luke/ui/AnalyzersTab.java
===================================================================
--- src/org/apache/lucene/luke/ui/AnalyzersTab.java	(revision 0)
+++ src/org/apache/lucene/luke/ui/AnalyzersTab.java	(working copy)
@@ -0,0 +1,218 @@
+package org.apache.lucene.luke.ui;
+
+import java.io.StringReader;
+import java.lang.reflect.Constructor;
+import java.net.URL;
+import java.util.Iterator;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
+import org.apache.lucene.luke.core.Util;
+import org.apache.lucene.luke.ui.LukeWindow.LukeMediator;
+import org.apache.lucene.util.Attribute;
+import org.apache.lucene.util.AttributeSource;
+import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.Version;
+import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.Bindable;
+import org.apache.pivot.collections.ArrayList;
+import org.apache.pivot.collections.HashMap;
+import org.apache.pivot.collections.List;
+import org.apache.pivot.collections.Map;
+import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.Resources;
+import org.apache.pivot.wtk.Action;
+import org.apache.pivot.wtk.Component;
+import org.apache.pivot.wtk.ListButton;
+import org.apache.pivot.wtk.ListView;
+import org.apache.pivot.wtk.ListView.SelectMode;
+import org.apache.pivot.wtk.ListViewSelectionListener;
+import org.apache.pivot.wtk.Span;
+import org.apache.pivot.wtk.TablePane;
+import org.apache.pivot.wtk.TableView;
+import org.apache.pivot.wtk.TextArea;
+
+public class AnalyzersTab extends TablePane implements Bindable {
+
+  @BXML
+  private ListButton analyzersListButton;
+  @BXML
+  private ListButton luceneVersionListButton;
+  @BXML
+  private TextArea inputText;
+  @BXML
+  private TableView tokenAttsTable;
+  @BXML
+  private ListView resultsList;
+
+  private Map<Integer,AttributeSource> attribs;
+
+  public AnalyzersTab() {
+    Action.getNamedActions().put("analyze", new Action() {
+      @Override
+      public void perform(Component component) {
+        analyze();
+      }
+    });
+  }
+
+  public void initLukeMediator(LukeMediator lukeMediator) {
+
+    analyzersListButton.setListData(new ArrayList<String>(lukeMediator.getAnalyzerNames()));
+    analyzersListButton.setSelectedIndex(0);
+    List<String> versions = new ArrayList<String>();
+    Version[] values = Version.values();
+    for (int i = 0; i < values.length; i++) {
+      Version v = values[i];
+      versions.add(v.toString());
+    }
+    luceneVersionListButton.setListData(versions);
+    luceneVersionListButton.setSelectedItem("LUCENE_CURRENT");
+  }
+
+  @Override
+  public void initialize(Map<String,Object> namespace, URL location, Resources resources) {
+    resultsList.setSelectMode(SelectMode.SINGLE);
+    resultsList.getListViewSelectionListeners().add(new ListViewSelectionListener() {
+
+      @Override
+      public void selectedRangesChanged(ListView listView, Sequence<Span> previousSelectedRanges) {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public void selectedRangeRemoved(ListView listView, int rangeStart, int rangeEnd) {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public void selectedRangeAdded(ListView listView, int rangeStart, int rangeEnd) {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public void selectedItemChanged(ListView listView, Object previousSelectedItem) {
+        tokenChange();
+
+      }
+    });
+  }
+
+  public void analyze() {
+    try {
+      Version v = Version.valueOf((String) luceneVersionListButton.getSelectedItem());
+      Class clazz = Class.forName((String) analyzersListButton.getSelectedItem());
+      Analyzer analyzer = null;
+      try {
+        Constructor<Analyzer> c = clazz.getConstructor(Version.class);
+        analyzer = c.newInstance(v);
+      } catch (Throwable t) {
+        try {
+          // no constructor with Version ?
+          analyzer = (Analyzer) clazz.newInstance();
+        } catch (Throwable t1) {
+          t1.printStackTrace();
+          // TODO:
+          // app
+          // .showStatus("Couldn't instantiate analyzer - public 0-arg or 1-arg constructor(Version) required");
+          return;
+        }
+      }
+      attribs = new HashMap<Integer,AttributeSource>();
+      TokenStream ts = analyzer.tokenStream("text", new StringReader(inputText.getText()));
+      List<String> listData = new ArrayList<String>();
+      ts.reset();
+      int cnt = 0;
+      while (ts.incrementToken()) {
+
+        listData.add(((CharTermAttribute) ts.getAttribute(CharTermAttribute.class)).toString());
+
+        attribs.put(cnt, ts.cloneAttributes());
+        cnt++;
+      }
+
+      resultsList.setListData(listData);
+
+    } catch (Throwable t) {
+      t.printStackTrace();
+      // TODO:
+      // app.showStatus("Error analyzing:" + t.getMessage());
+    }
+    tokenChange();
+  }
+
+  public void tokenChange() {
+    int selectedIndex = resultsList.getSelectedIndex();
+    if (selectedIndex == -1) {
+      return;
+    }
+    AttributeSource attribSource = attribs.get(selectedIndex);
+    if (attribSource == null) {
+      return;
+    }
+    Iterator it = attribSource.getAttributeClassesIterator();
+    ArrayList<Map<String,String>> tableData = new ArrayList<Map<String,String>>();
+
+    tokenAttsTable.setTableData(tableData);
+    while (it.hasNext()) {
+      Class cl = (Class) it.next();
+      String attClass = cl.getName();
+      if (attClass.startsWith("org.apache.lucene.")) {
+        attClass = cl.getSimpleName();
+      }
+      Attribute att = attribSource.getAttribute(cl);
+      String implClass = att.getClass().getName();
+      if (implClass.startsWith("org.apache.lucene.")) {
+        implClass = att.getClass().getSimpleName();
+      }
+
+      Map<String,String> row = new HashMap<String,String>();
+
+      tableData.add(row);
+
+      row.put("class", attClass);
+      row.put("impl", implClass);
+
+      String val = null;
+      if (attClass.equals("CharTermAttribute")) {
+        val = ((CharTermAttribute) att).toString();
+      } else if (attClass.equals("FlagsAttribute")) {
+        val = Integer.toHexString(((FlagsAttribute) att).getFlags());
+      } else if (attClass.equals("OffsetAttribute")) {
+        OffsetAttribute off = (OffsetAttribute) att;
+        val = off.startOffset() + "," + off.endOffset();
+      } else if (attClass.equals("PayloadAttribute")) {
+        BytesRef payload = ((PayloadAttribute) att).getPayload();
+        if (payload != null) {
+          byte[] data = payload.bytes;
+          val = Util.bytesToHex(data, 0, data.length, false);
+        } else {
+          val = "";
+        }
+      } else if (attClass.equals("PositionIncrementAttribute")) {
+        val = ((PositionIncrementAttribute) att).getPositionIncrement() + "";
+      } else if (attClass.equals("TypeAttribute")) {
+        val = ((TypeAttribute) att).type();
+      } else {
+        val = att.toString();
+      }
+      row.put("value", val);
+    }
+
+    if (attribSource.hasAttribute(OffsetAttribute.class)) {
+      OffsetAttribute off = (OffsetAttribute) attribSource.getAttribute(OffsetAttribute.class);
+
+      inputText.setSelection(off.startOffset(), off.endOffset() - off.startOffset());
+      inputText.requestFocus();
+    }
+  }
+}
Index: src/org/apache/lucene/luke/ui/FilesTab.bxml
===================================================================
--- src/org/apache/lucene/luke/ui/FilesTab.bxml	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/FilesTab.bxml	(working copy)
@@ -1,86 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<luke:FilesTab orientation="vertical"
-	splitRatio="0.2" 
-	xmlns:bxml="http://pivot.apache.org/bxml"
-    xmlns:content="org.apache.pivot.wtk.content"
-    xmlns="org.apache.pivot.wtk" xmlns:luke="org.apache.lucene.luke.ui">
+<luke:FilesTab orientation="vertical" splitRatio="0.2"
+	xmlns:bxml="http://pivot.apache.org/bxml" xmlns:content="org.apache.pivot.wtk.content"
+	xmlns="org.apache.pivot.wtk" xmlns:luke="org.apache.lucene.luke.ui">
 	<left>
-		<Border styles="{padding:6}">
-			<content>
-				<BoxPane orientation="vertical" styles="{fill:true}">
-					<Label text="%filesTab_selectCommitPoint" />
-					<Separator />
-					<Label
-						text="%filesTab_selectHint" />
-					<ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
-						<view>
-							<TableView bxml:id="commitsTable">
-								<columns>
-									<TableView.Column name="gen" width="1*"
-										headerData="%filesTab_commitsTable_col1" />
-									<TableView.Column name="flags" width="1*"
-										headerData="%filesTab_commitsTable_col2" />
-									<TableView.Column name="version" width="1*"
-										headerData="%filesTab_commitsTable_col3" />
-									<TableView.Column name="timestamp" width="1*"
-										headerData="%filesTab_commitsTable_col4" />
-									<TableView.Column name="userdata" width="1*"
-										headerData="%filesTab_commitsTable_col5" />
-								</columns>
-							</TableView>
-						</view>
-						<columnHeader>
-							<TableViewHeader tableView="$commitsTable" />
-						</columnHeader>
-					</ScrollPane>
-				</BoxPane>
-			</content>
-		</Border>
+		<TablePane>
+			<columns>
+				<TablePane.Column width="1*" />
+			</columns>
+			<rows>
+				<TablePane.Row height="1*">
+					<BoxPane orientation="vertical" styles="{fill:true}">
+						<Label text="%filesTab_selectCommitPoint" />
+						<Separator />
+						<Label text="%filesTab_selectHint" />
+						<ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
+							<view>
+								<TableView bxml:id="commitsTable">
+									<columns>
+										<TableView.Column name="gen" width="1*"
+											headerData="%filesTab_commitsTable_col1" />
+										<TableView.Column name="flags" width="1*"
+											headerData="%filesTab_commitsTable_col2" />
+										<TableView.Column name="version" width="1*"
+											headerData="%filesTab_commitsTable_col3" />
+										<TableView.Column name="timestamp" width="1*"
+											headerData="%filesTab_commitsTable_col4" />
+										<TableView.Column name="userdata" width="1*"
+											headerData="%filesTab_commitsTable_col5" />
+									</columns>
+								</TableView>
+							</view>
+							<columnHeader>
+								<TableViewHeader tableView="$commitsTable" />
+							</columnHeader>
+						</ScrollPane>
+					</BoxPane>
+				</TablePane.Row>
+			</rows>
+		</TablePane>
 	</left>
 	<right>
-		<Border styles="{padding:6}">
-			<content>
-				<TablePane>
-
-					<columns>
-						<TablePane.Column width="1*" />
-					</columns>
-					<rows>
-						<TablePane.Row>
-
-							<Label text="%filesTab_commitsSize" />
-						</TablePane.Row>
-						<TablePane.Row>
-							<Label bxml:id="iFileSize" text="?" />
-						</TablePane.Row>
-						<TablePane.Row height="1*">
-							<ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
-								<view>
-									<TableView bxml:id="filesTable">
-										<columns>
-											<TableView.Column name="filename" width="1*"
-												headerData="%filesTab_filesTable_col1" />
-											<TableView.Column name="size" width="1*"
-												headerData="%filesTab_filesTable_col2" />
-											<TableView.Column name="unit" width="1*"
-												headerData="%filesTab_filesTable_col3" />
-											<TableView.Column name="deletable" width="1*"
-												headerData="%filesTab_filesTable_col4" />
-											<TableView.Column name="inusefunction"
-												width="1*" headerData="%filesTab_filesTable_col5" />
-										</columns>
-									</TableView>
-								</view>
-								<columnHeader>
-									<TableViewHeader tableView="$filesTable" />
-								</columnHeader>
-							</ScrollPane>
-						</TablePane.Row>
-					</rows>
-				</TablePane>
-
-			</content>
-		</Border>
+		<TablePane>
+			<columns>
+				<TablePane.Column width="1*" />
+			</columns>
+			<rows>
+				<TablePane.Row height="1*">
+					<TablePane>
+						<columns>
+							<TablePane.Column width="1*" />
+						</columns>
+						<rows>
+							<TablePane.Row>
+								<Label text="%filesTab_commitsSize" />
+							</TablePane.Row>
+							<TablePane.Row>
+								<Label bxml:id="iFileSize" text="?" />
+							</TablePane.Row>
+							<TablePane.Row height="1*">
+								<ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
+									<view>
+										<TableView bxml:id="filesTable">
+											<columns>
+												<TableView.Column name="filename" width="1*"
+													headerData="%filesTab_filesTable_col1" />
+												<TableView.Column name="size" width="1*"
+													headerData="%filesTab_filesTable_col2" />
+												<TableView.Column name="unit" width="1*"
+													headerData="%filesTab_filesTable_col3" />
+												<TableView.Column name="deletable" width="1*"
+													headerData="%filesTab_filesTable_col4" />
+												<TableView.Column name="inusefunction"
+													width="1*" headerData="%filesTab_filesTable_col5" />
+											</columns>
+										</TableView>
+									</view>
+									<columnHeader>
+										<TableViewHeader tableView="$filesTable" />
+									</columnHeader>
+								</ScrollPane>
+							</TablePane.Row>
+						</rows>
+					</TablePane>
+				</TablePane.Row>
+			</rows>
+		</TablePane>
 	</right>
-</luke:FilesTab>
\ No newline at end of file
+</luke:FilesTab>
Index: src/org/apache/lucene/luke/ui/SearchTab.bxml
===================================================================
--- src/org/apache/lucene/luke/ui/SearchTab.bxml	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/SearchTab.bxml	(working copy)
@@ -1,143 +1,155 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<luke:SearchTab orientation="vertical" splitRatio="0.3"
-	xmlns:bxml="http://pivot.apache.org/bxml" xmlns:content="org.apache.pivot.wtk.content"
-	xmlns="org.apache.pivot.wtk" xmlns:luke="org.apache.lucene.luke.ui">
+<luke:SearchTab bxml:id="SearchTab" xmlns:bxml="http://pivot.apache.org/bxml"
+	xmlns:content="org.apache.pivot.wtk.content" xmlns="org.apache.pivot.wtk"
+	xmlns:luke="org.apache.lucene.luke.ui" orientation="vertical"
+	splitRatio="0.3">
 	<left>
-		<Border styles="{padding:6,backgroundColor:11,thickness:0}">
-			<content>
-				<ScrollPane horizontalScrollBarPolicy="fill_to_capacity"  styles="{backgroundColor:11}">
-					<TablePane
-						styles="{horizontalSpacing:5,verticalSpacing:5,backgroundColor:11}">
-						<columns>
-							<TablePane.Column width="1*" />
-							<TablePane.Column width="1*" />
-						</columns>
-						<rows>
-							<TablePane.Row>
+		<TablePane>
+			<columns>
+				<TablePane.Column width="1*" />
+			</columns>
+			<rows>
+				<TablePane.Row height="1*">
+					<ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
+						styles="{backgroundColor:11}">
+						<TablePane
+							styles="{horizontalSpacing:5,verticalSpacing:5,backgroundColor:11}">
+							<columns>
+								<TablePane.Column width="1*" />
+								<TablePane.Column width="1*" />
+							</columns>
+							<rows>
+								<TablePane.Row>
+									<BoxPane orientation="vertical" styles="{fill:true}">
+										<FlowPane>
+											<Label text="%searchTab_searchPrompt" />
+											<ScrollPane horizontalScrollBarPolicy="fill"
+												verticalScrollBarPolicy="fill_to_capacity" preferredHeight="60"
+												preferredWidth="250">
+												<view>
+													<Border>
+														<content>
+															<TextArea bxml:id="queryTextArea" text="" />
+														</content>
+													</Border>
+												</view>
+											</ScrollPane>
 
-								<BoxPane orientation="vertical" styles="{fill:true}">
-									<FlowPane>
-										<Label text="%searchTab_searchPrompt" />
-										<ScrollPane horizontalScrollBarPolicy="fill"
-											verticalScrollBarPolicy="fill_to_capacity" preferredHeight="60"
-											preferredWidth="250">
-											<view>
-												<Border>
-													<content>
-														<TextArea bxml:id="queryTextArea" text="" />
-													</content>
-												</Border>
-											</view>
-										</ScrollPane>
+											<PushButton preferredHeight="20" action="search">
+												<buttonData>
+													<content:ButtonData icon="/img/search.gif"
+														text="Search" />
+												</buttonData>
+											</PushButton>
 
-										<PushButton preferredHeight="20" action="search">
-											<buttonData>
-												<content:ButtonData icon="/img/search.gif"
-													text="Search" />
-											</buttonData>
-										</PushButton>
+										</FlowPane>
+										<BoxPane orientation="horizontal">
+											<Label text="Query details:  " />
+											<PushButton width="45" buttonData="%searchTab_update"
+												action="showParsed" />
+											<PushButton width="95" buttonData="%searchTab_explainStructure"
+												action="explainStructure" />
+										</BoxPane>
+										<TabPane width="300" preferredWidth="300"
+											styles="{tabOrientation:'vertical'}">
+											<tabs>
+												<ScrollPane styles="{backgroundColor:11}">
+													<TabPane.tabData>
+														<content:ButtonData text="%searchTab_Parsed" />
+													</TabPane.tabData>
+													<view>
+														<BoxPane>
 
-									</FlowPane>
-									<BoxPane orientation="horizontal">
-										<Label text="Query details:  " />
-										<PushButton width="45" buttonData="%searchTab_update"
-											action="showParsed" />
-										<PushButton width="95" buttonData="%searchTab_explainStructure"
-											action="explainStructure" />
+															<Label bxml:id="parsedQueryLabel" text="" />
+														</BoxPane>
+													</view>
+												</ScrollPane>
+												<ScrollPane styles="{backgroundColor:11}">
+													<TabPane.tabData>
+														<content:ButtonData text="%searchTab_Rewritten" />
+													</TabPane.tabData>
+													<view>
+														<BoxPane styles="{fill:true}">
+															<Label bxml:id="rewrittenQueryLabel" text="" />
+
+														</BoxPane>
+													</view>
+												</ScrollPane>
+											</tabs>
+
+										</TabPane>
 									</BoxPane>
-									<TabPane width="300" preferredWidth="300"
-										styles="{tabOrientation:'vertical'}">
+
+									<TabPane>
 										<tabs>
-											<ScrollPane styles="{backgroundColor:11}">
+											<BoxPane>
 												<TabPane.tabData>
-													<content:ButtonData text="%searchTab_Parsed" />
+													<content:ButtonData text="%searchTab_analysis" />
 												</TabPane.tabData>
-												<view>
-													<BoxPane>
+												<Border styles="{backgroundColor:11}">
+													<content>
+														<BoxPane orientation="vertical">
+															<Label text="%searchTab_searchAnalyzer" />
+															<Label text="%searchTab_classNote" />
 
-														<Label bxml:id="parsedQueryLabel" text="" />
-													</BoxPane>
-												</view>
-											</ScrollPane>
-											<ScrollPane styles="{backgroundColor:11}">
-												<TabPane.tabData>
-													<content:ButtonData text="%searchTab_Rewritten" />
-												</TabPane.tabData>
-												<view>
-													<BoxPane styles="{fill:true}">
-														<Label bxml:id="rewrittenQueryLabel" text=""/>
-
-													</BoxPane>
-												</view>
-											</ScrollPane>
+															<ListButton bxml:id="analyzerList" listSize="20" />
+															<Label text="%searchTab_defaultField" />
+														</BoxPane>
+													</content>
+												</Border>
+											</BoxPane>
 										</tabs>
-
 									</TabPane>
-								</BoxPane>
+								</TablePane.Row>
+							</rows>
+						</TablePane>
+					</ScrollPane>
+				</TablePane.Row>
+			</rows>
+		</TablePane>
+	</left>
+	<right>
+		<TablePane>
+			<columns>
+				<TablePane.Column width="1*" />
+			</columns>
+			<rows>
+				<TablePane.Row height="1*">
+					<TablePane>
 
-								<TabPane>
-									<tabs>
-										<BoxPane>
-											<TabPane.tabData>
-												<content:ButtonData text="%searchTab_analysis" />
-											</TabPane.tabData>
-											<Border styles="{backgroundColor:11}">
-												<content>
-													<BoxPane orientation="vertical">
-														<Label text="%searchTab_searchAnalyzer" />
-														<Label text="%searchTab_classNote" />
+						<columns>
+							<TablePane.Column width="1*" />
+						</columns>
+						<rows>
+							<TablePane.Row>
+								<Label text="%searchTab_results" />
+							</TablePane.Row>
+							<TablePane.Row height="1*">
+								<ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
+									styles="{backgroundColor:11}">
+									<view>
+										<TableView bxml:id="searchResultsTable">
+											<columns>
+												<TableView.Column name="num"
+													headerData="%searchTab_searchTable_col1" />
+												<TableView.Column name="score"
+													headerData="%searchTab_searchTable_col2" />
+												<TableView.Column name="docId"
+													headerData="%searchTab_searchTable_col3" />
+											</columns>
 
-														<ListButton bxml:id="analyzerList" listSize="20" />
-														<Label text="%searchTab_defaultField" />
-													</BoxPane>
-												</content>
-											</Border>
-										</BoxPane>
-									</tabs>
-								</TabPane>
+										</TableView>
+									</view>
+									<columnHeader>
+										<TableViewHeader tableView="$searchResultsTable" />
+									</columnHeader>
+								</ScrollPane>
 							</TablePane.Row>
 						</rows>
 					</TablePane>
-				</ScrollPane>
-			</content>
-		</Border>
-	</left>
-	<right>
-		<Border styles="{padding:6,backgroundColor:11}">
-			<content>
-				<TablePane>
-
-					<columns>
-						<TablePane.Column width="1*" />
-					</columns>
-					<rows>
-						<TablePane.Row>
-							<Label text="%searchTab_results" />
-						</TablePane.Row>
-						<TablePane.Row height="1*">
-							<ScrollPane horizontalScrollBarPolicy="fill_to_capacity" styles="{backgroundColor:11}">
-								<view>
-									<TableView bxml:id="searchResultsTable">
-										<columns>
-											<TableView.Column name="num"
-												headerData="%searchTab_searchTable_col1" />
-											<TableView.Column name="score"
-												headerData="%searchTab_searchTable_col2" />
-											<TableView.Column name="docId"
-												headerData="%searchTab_searchTable_col3" />
-										</columns>
-
-									</TableView>
-								</view>
-								<columnHeader>
-									<TableViewHeader tableView="$searchResultsTable" />
-								</columnHeader>
-							</ScrollPane>
-						</TablePane.Row>
-					</rows>
-				</TablePane>
-			</content>
-		</Border>
+				</TablePane.Row>
+			</rows>
+		</TablePane>
 	</right>
 </luke:SearchTab>
\ No newline at end of file
Index: src/org/apache/lucene/luke/ui/OverviewTab.bxml
===================================================================
--- src/org/apache/lucene/luke/ui/OverviewTab.bxml	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/OverviewTab.bxml	(working copy)
@@ -1,242 +1,253 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<luke:OverviewTab xmlns:bxml="http://pivot.apache.org/bxml"
-	xmlns:content="org.apache.pivot.wtk.content" xmlns="org.apache.pivot.wtk"
-	xmlns:luke="org.apache.lucene.luke.ui" orientation="vertical" styles="{useShadow:true}"
-	splitRatio="0.25">
+<luke:OverviewTab bxml:id="OverviewTab"
+	xmlns:bxml="http://pivot.apache.org/bxml" xmlns:content="org.apache.pivot.wtk.content"
+	xmlns="org.apache.pivot.wtk" xmlns:luke="org.apache.lucene.luke.ui"
+	orientation="vertical" splitRatio="0.25">
 	<top>
-		<Border>
-			<content>
-				<ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
-					styles="{backgroundColor:11}">
-					<view>
-						<TablePane bxml:id="masterTable"
-							styles="{verticalSpacing:2,horizontalSpacing:2,padding:4}">
-							<columns>
-								<TablePane.Column width="1*" />
-							</columns>
-							<rows>
-								<TablePane.Row height="1*">
-									<TablePane bxml:id="tablePane1"
-										styles="{verticalSpacing:0,horizontalSpacing:2}">
-										<columns>
-											<TablePane.Column />
-											<TablePane.Column width="1*" />
-										</columns>
-										<rows>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_indexPath"
-													styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
-												<Label bxml:id="iPath" text="?"
-													styles="{backgroundColor:'#fcfdfd',padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_indexCodec"
-													styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
-												<Label bxml:id="indexCodec" text="?"
-													styles="{backgroundColor:11,padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_numFields"
-													styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
-												<Label bxml:id="iFields" text="?"
-													styles="{backgroundColor:'#fcfdfd',padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_numDocs"
-													styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
-												<Label bxml:id="iDocs" text="?"
-													styles="{backgroundColor:11,padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row bxml:id="iTermsRow" height="-1">
-												<Label text="%overviewTab_numTerms"
-													styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
-												<Label bxml:id="iTerms" text="?"
-													styles="{backgroundColor:'#fcfdfd',padding:2, horizontalAlignment:'left'}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_hasDelOpt"
-													styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
-												<Label bxml:id="iDelOpt" text="? / ?"
-													styles="{backgroundColor:11,padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_lastModified"
-													styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
-												<Label bxml:id="iMod" text="?"
-													styles="{backgroundColor:'#fcfdfd',padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_indexVersion"
-													styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
-												<Label bxml:id="iVer" text="?"
-													styles="{backgroundColor:11,padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_indexFormat"
-													styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
-												<Label bxml:id="iFormat" text="?"
-													styles="{backgroundColor:'#fcfdfd',padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_indexFunctionality"
-													styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
-												<Label bxml:id="iCaps" text="?"
-													styles="{backgroundColor:11,padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_indexDivisor"
-													styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
-												<Label bxml:id="iTiiDiv" text="?"
-													styles="{backgroundColor:'#fcfdfd',padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_dirImpl"
-													styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
-												<Label bxml:id="dirImpl" text="?"
-													styles="{backgroundColor:11,padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_openedCommit"
-													styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
-												<Label bxml:id="iCommit" text=""
-													styles="{backgroundColor:'#fcfdfd',padding:2}" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label text="%overviewTab_userData"
-													styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
-												<Label bxml:id="iUser" text=""
-													styles="{backgroundColor:11,padding:2}" />
-											</TablePane.Row>
-										</rows>
-									</TablePane>
-								</TablePane.Row>
-							</rows>
-						</TablePane>
-					</view>
-				</ScrollPane>
-			</content>
-		</Border>
+		<TablePane>
+			<columns>
+				<TablePane.Column width="1*" />
+			</columns>
+			<rows>
+				<TablePane.Row height="1*">
+					<ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
+						styles="{backgroundColor:11}">
+						<view>
+							<TablePane bxml:id="masterable"
+								styles="{verticalSpacing:2,horizontalSpacing:2,padding:4}">
+								<columns>
+									<TablePane.Column width="1*" />
+								</columns>
+								<rows>
+									<TablePane.Row height="1*">
+										<TablePane bxml:id="tablePane1"
+											styles="{verticalSpacing:0,horizontalSpacing:2}">
+											<columns>
+												<TablePane.Column />
+												<TablePane.Column width="1*" />
+											</columns>
+											<rows>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_indexPath"
+														styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
+													<Label bxml:id="iPath" text="?"
+														styles="{backgroundColor:'#fcfdfd',padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_indexCodec"
+														styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
+													<Label bxml:id="indexCodec" text="?"
+														styles="{backgroundColor:11,padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_numFields"
+														styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
+													<Label bxml:id="iFields" text="?"
+														styles="{backgroundColor:'#fcfdfd',padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_numDocs"
+														styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
+													<Label bxml:id="iDocs" text="?"
+														styles="{backgroundColor:11,padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row bxml:id="iTermsRow" height="-1">
+													<Label text="%overviewTab_numTerms"
+														styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
+													<Label bxml:id="iTerms" text="?"
+														styles="{backgroundColor:'#fcfdfd',padding:2, horizontalAlignment:'left'}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_hasDelOpt"
+														styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
+													<Label bxml:id="iDelOpt" text="? / ?"
+														styles="{backgroundColor:11,padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_lastModified"
+														styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
+													<Label bxml:id="iMod" text="?"
+														styles="{backgroundColor:'#fcfdfd',padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_indexVersion"
+														styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
+													<Label bxml:id="iVer" text="?"
+														styles="{backgroundColor:11,padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_indexFormat"
+														styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
+													<Label bxml:id="iFormat" text="?"
+														styles="{backgroundColor:'#fcfdfd',padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_indexFunctionality"
+														styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
+													<Label bxml:id="iCaps" text="?"
+														styles="{backgroundColor:11,padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_indexDivisor"
+														styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
+													<Label bxml:id="iTiiDiv" text="?"
+														styles="{backgroundColor:'#fcfdfd',padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_dirImpl"
+														styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
+													<Label bxml:id="dirImpl" text="?"
+														styles="{backgroundColor:11,padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_openedCommit"
+														styles="{font:{bold:true},backgroundColor:'#dce0e7',padding:2}" />
+													<Label bxml:id="iCommit" text=""
+														styles="{backgroundColor:'#fcfdfd',padding:2}" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label text="%overviewTab_userData"
+														styles="{font:{bold:true},backgroundColor:'#f1f1f1',padding:2}" />
+													<Label bxml:id="iUser" text=""
+														styles="{backgroundColor:11,padding:2}" />
+												</TablePane.Row>
+											</rows>
+										</TablePane>
+									</TablePane.Row>
+								</rows>
+							</TablePane>
+						</view>
+					</ScrollPane>
+				</TablePane.Row>
+			</rows>
+		</TablePane>
 	</top>
 	<bottom>
-		<Border>
-			<content>
-				<TablePane bxml:id="bottomTable"
-					styles="{verticalSpacing:5,horizontalSpacing:1,padding:5,backgroundColor:11}">
-					<columns>
-						<TablePane.Column width="1*" />
-					</columns>
-					<rows>
-						<TablePane.Row height="1*">
-							<SplitPane bxml:id="splitPane" orientation="horizontal"
-								styles="{useShadow:true}" splitRatio="0.45">
-								<left>
-									<TablePane bxml:id="fListTablePane"
-										styles="{verticalSpacing:1,horizontalSpacing:1}">
-										<columns>
-											<TablePane.Column width="1*" />
-										</columns>
-										<rows>
-											<TablePane.Row height="-1">
-												<Label styles="{backgroundColor:11,padding:2}" text="%overviewTab_fieldSelect" />
-											</TablePane.Row>
-											<TablePane.Row height="-1">
-												<Label styles="{backgroundColor:11,font:{bold:true}}"
-													text="%overviewTab_fieldsAndTermCounts" />
-											</TablePane.Row>
-											<TablePane.Row bxml:id="fieldsAiRow" height="-1" />
-											<TablePane.Row height="1*">
-												<Border styles="{padding:1}">
-													<content>
-														<ScrollPane verticalScrollBarPolicy="always"
-															horizontalScrollBarPolicy="fill_to_capacity">
-															<view>
-																<TableView bxml:id="fieldsTable" selectMode="multi">
-																	<columns>
-																		<TableView.Column name="name" width="1*"
-																			headerData="Name" />
-																		<TableView.Column name="termCount"
-																			width="1*" headerData="Term Count" />
-																		<TableView.Column name="percent"
-																			width="1*" headerData="%%" />
-																		<TableView.Column name="decoder"
-																			width="1*" headerData="Decoder" />
-																	</columns>
+		<TablePane>
+			<columns>
+				<TablePane.Column width="1*" />
+			</columns>
+			<rows>
+				<TablePane.Row height="1*">
 
-																</TableView>
-															</view>
-															<columnHeader>
-																<TableViewHeader tableView="$fieldsTable" />
-															</columnHeader>
-														</ScrollPane>
-													</content>
-												</Border>
-											</TablePane.Row>
-										</rows>
-									</TablePane>
-								</left>
-								<right>
-									<TablePane bxml:id="tListTablePane"
-										styles="{verticalSpacing:1,horizontalSpacing:1}">
-										<columns>
-											<TablePane.Column width="1*" />
-										</columns>
-										<rows>
-											<TablePane.Row height="-1">
-												<BoxPane orientation="vertical" preferredWidth="200"
-													styles="{fill:true,backgroundColor:11}">
-													<TextArea styles="{font:{size:'80%'}}" text="%overviewTab_topTermsHint" />
-													<TextArea styles="{font:{size:'80%'}}" text="%overviewTab_decoderWarn" />
+					<TablePane bxml:id="bottomTable"
+						styles="{verticalSpacing:5,horizontalSpacing:1,padding:5,backgroundColor:11}">
+						<columns>
+							<TablePane.Column width="1*" />
+						</columns>
+						<rows>
+							<TablePane.Row height="1*">
+								<SplitPane bxml:id="splitPane" orientation="horizontal"
+									styles="{useShadow:true}" splitRatio="0.45">
+									<left>
+										<TablePane bxml:id="fListTablePane"
+											styles="{verticalSpacing:1,horizontalSpacing:1}">
+											<columns>
+												<TablePane.Column width="1*" />
+											</columns>
+											<rows>
+												<TablePane.Row height="-1">
+													<Label styles="{backgroundColor:11,padding:2}" text="%overviewTab_fieldSelect" />
+												</TablePane.Row>
+												<TablePane.Row height="-1">
+													<Label styles="{backgroundColor:11,font:{bold:true}}"
+														text="%overviewTab_fieldsAndTermCounts" />
+												</TablePane.Row>
+												<TablePane.Row bxml:id="fieldsAiRow" height="-1" />
+												<TablePane.Row height="1*">
+													<Border styles="{padding:1}">
+														<content>
+															<ScrollPane verticalScrollBarPolicy="always"
+																horizontalScrollBarPolicy="fill_to_capacity">
+																<view>
+																	<TableView bxml:id="fieldsTable" selectMode="multi">
+																		<columns>
+																			<TableView.Column name="name" width="1*"
+																				headerData="Name" />
+																			<TableView.Column name="termCount"
+																				width="1*" headerData="Term Count" />
+																			<TableView.Column name="percent"
+																				width="1*" headerData="%%" />
+																			<TableView.Column name="decoder"
+																				width="1*" headerData="Decoder" />
+																		</columns>
 
-													<Label text="Number of top terms:" styles="{font:{bold:true}}" />
+																	</TableView>
+																</view>
+																<columnHeader>
+																	<TableViewHeader tableView="$fieldsTable" />
+																</columnHeader>
+															</ScrollPane>
+														</content>
+													</Border>
+												</TablePane.Row>
+											</rows>
+										</TablePane>
+									</left>
+									<right>
+										<TablePane bxml:id="tListTablePane"
+											styles="{verticalSpacing:1,horizontalSpacing:1}">
+											<columns>
+												<TablePane.Column width="1*" />
+											</columns>
+											<rows>
+												<TablePane.Row height="-1">
+													<BoxPane orientation="vertical" preferredWidth="200"
+														styles="{fill:true,backgroundColor:11}">
+														<TextArea styles="{font:{size:'80%'}}" text="%overviewTab_topTermsHint" />
+														<TextArea styles="{font:{size:'80%'}}" text="%overviewTab_decoderWarn" />
 
-													<Spinner bxml:id="nTerms" selectedIndex="50">
-														<spinnerData>
-															<content:NumericSpinnerData
-																lowerBound="0" upperBound="999999" increment="1" />
-														</spinnerData>
-													</Spinner>
-													<PushButton buttonData="%overviewTab_showTopTerms"
-														action="topTerms" />
-												</BoxPane>
-											</TablePane.Row>
-											<TablePane.Row>
-												<Label styles="{backgroundColor:11}" text="%overviewTab_topRankingTerms" />
-											</TablePane.Row>
-											<TablePane.Row bxml:id="topTermsAiRow" />
-											<TablePane.Row height="1*">
-												<Border styles="{padding:1}">
-													<content>
-														<ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
-															<view>
-																<TableView bxml:id="tTable">
-																	<columns>
-																		<TableView.Column name="num" width="35"
-																			headerData="%overviewTab_topTermsTable_col1" />
-																		<TableView.Column name="df" width="50"
-																			headerData="%overviewTab_topTermsTable_col2" />
-																		<TableView.Column name="field" width="170"
-																			headerData="%overviewTab_topTermsTable_col3" />
-																		<TableView.Column name="text" width="1*"
-																			headerData="%overviewTab_topTermsTable_col4" />
-																	</columns>
-																</TableView>
-															</view>
-															<columnHeader>
-																<TableViewHeader tableView="$tTable" />
-															</columnHeader>
-														</ScrollPane>
-													</content>
-												</Border>
-											</TablePane.Row>
-										</rows>
-									</TablePane>
-								</right>
-							</SplitPane>
-						</TablePane.Row>
-					</rows>
-				</TablePane>
-			</content>
-		</Border>
+														<Label text="Number of top terms:" styles="{font:{bold:true}}" />
+
+														<Spinner bxml:id="nTerms" selectedIndex="50">
+															<spinnerData>
+																<content:NumericSpinnerData
+																	lowerBound="0" upperBound="999999" increment="1" />
+															</spinnerData>
+														</Spinner>
+														<PushButton buttonData="%overviewTab_showTopTerms"
+															action="topTerms" />
+													</BoxPane>
+												</TablePane.Row>
+												<TablePane.Row>
+													<Label styles="{backgroundColor:11}" text="%overviewTab_topRankingTerms" />
+												</TablePane.Row>
+												<TablePane.Row bxml:id="topTermsAiRow" />
+												<TablePane.Row height="1*">
+													<Border styles="{padding:1}">
+														<content>
+															<ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
+																<view>
+																	<TableView bxml:id="tTable">
+																		<columns>
+																			<TableView.Column name="num" width="35"
+																				headerData="%overviewTab_topTermsTable_col1" />
+																			<TableView.Column name="df" width="50"
+																				headerData="%overviewTab_topTermsTable_col2" />
+																			<TableView.Column name="field"
+																				width="170" headerData="%overviewTab_topTermsTable_col3" />
+																			<TableView.Column name="text" width="1*"
+																				headerData="%overviewTab_topTermsTable_col4" />
+																		</columns>
+																	</TableView>
+																</view>
+																<columnHeader>
+																	<TableViewHeader tableView="$tTable" />
+																</columnHeader>
+															</ScrollPane>
+														</content>
+													</Border>
+												</TablePane.Row>
+											</rows>
+										</TablePane>
+									</right>
+								</SplitPane>
+							</TablePane.Row>
+						</rows>
+					</TablePane>
+				</TablePane.Row>
+			</rows>
+		</TablePane>
 	</bottom>
 </luke:OverviewTab>
\ No newline at end of file
Index: src/org/apache/lucene/luke/ui/LukeApplication_en.json
===================================================================
--- src/org/apache/lucene/luke/ui/LukeApplication_en.json	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/LukeApplication_en.json	(working copy)
@@ -7,6 +7,7 @@
  tools: "Tools",
  settings: "Settings",
  help: "Help",
+ about: "About",
  
  lukeWindow_overviewTabText: "Overview",
  lukeWindow_documentsTabText: "Documents",
@@ -17,8 +18,14 @@
  
  openLuceneIndex: "Open Lucene Index",
  commitChanges: "Commit Changes",
+ exit: "Exit Luke",
  undeleteAll: "Undelete All",
  optimizeIndex: "Optimize Index",
+ defaultTheme: "Default Theme",
+ grayTheme: "Gray Theme",
+ sandstoneTheme: "Sandstone Theme",
+ skyTheme: "Sky Theme",
+ navyTheme: "Navy Theme",
  
  lukeInitWindow_title: "Path to index directory:",
  lukeInitWindow_path: "Path:",
@@ -83,7 +90,6 @@
  documentsTab_docTable_col3: "Norm",
  documentsTab_docTable_col4: "Value",
  
- 
  searchTab_searchPrompt: "Enter search expression here:",
  searchTab_update: "Update",
  searchTab_explainStructure: "Explain Structure",
Index: src/org/apache/lucene/luke/ui/AnalyzersTab.bxml
===================================================================
--- src/org/apache/lucene/luke/ui/AnalyzersTab.bxml	(revision 1517404)
+++ src/org/apache/lucene/luke/ui/AnalyzersTab.bxml	(working copy)
@@ -1,12 +1,12 @@
-<luke:AnalyzersTab styles="{backgroundColor:11}"
+<luke:AnalyzersTab bxml:id="AnalyzersTab"
 	xmlns:bxml="http://pivot.apache.org/bxml" xmlns:content="org.apache.pivot.wtk.content"
 	xmlns="org.apache.pivot.wtk" xmlns:luke="org.apache.lucene.luke.ui">
 
 	<columns>
-		<TablePane.Column width="1*"/>
+		<TablePane.Column width="1*" />
 	</columns>
 	<rows>
-		<TablePane.Row>
+		<TablePane.Row bxml:id="givenRow">
 			<BoxPane styles="{fill:true, padding:3}" orientation="vertical">
 				<TablePane styles="{horizontalSpacing:3, verticalSpacing:3}">
 					<columns>