Index: app/src/compiledic/Makefile
===================================================================
--- app/src/compiledic/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
+++ app/src/compiledic/Makefile	(revision 246900abc92b7d822ca17bd69aeb06d2b30db588)
@@ -5,4 +5,5 @@
 
 compiledic:
+
 
 aut2fsa: aut2fsa.cc
Index: app/src/kon/kon
===================================================================
--- app/src/kon/kon	(revision eedf64882e7666a03c82e27ad96b549ec906b663)
+++ app/src/kon/kon	(revision 246900abc92b7d822ca17bd69aeb06d2b30db588)
@@ -18,17 +18,17 @@
 my $help=0;
 
-my $configfile1="../../conf/con.conf";
-my $configfile2="../conf/con.conf";
+my $systemconfigfile='/usr/local/etc/utt/kon.conf';
+my $userconfigfile="$ENV{'HOME'}/.utt/kon.conf";
 
 #read configuration files###########################
 my $file;
-foreach $file ($configfile1, $configfile2){
+foreach $file ($systemconfigfile, $userconfigfile){
   if(open(CONFIG, $file)){
   	while (<CONFIG>) {
-  		chomp;                  
-      		s/#.*//;                
-	      	s/^\s+//;               
-      		s/\s+$//;               
-    		next unless length;     
+  		chomp;
+      		s/#.*//;
+	      	s/^\s+//;
+      		s/\s+$//;
+    		next unless length;
     		my ($name, $value) = split(/\s*=\s*/, $_, 2);
     		if(($name eq "left")or($name eq "l")){
@@ -65,6 +65,6 @@
 			$help=1;
     		}
-    	
-	} 
+
+	}
   	close CONFIG;
   }
@@ -485,5 +485,5 @@
       white_into_symbols(\$right_string);
 #ponizsza linijka dodana 18 listopada
-      white_into_symbols(\${$CENTER_REF}[$index]);	
+      white_into_symbols(\${$CENTER_REF}[$index]);
     }
 
Index: app/src/kot/kot
===================================================================
--- app/src/kot/kot	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/kot/kot	(revision 246900abc92b7d822ca17bd69aeb06d2b30db588)
@@ -8,17 +8,17 @@
 my $spaces=0;
 
-my $configfile1="../../conf/kot.conf";
-my $configfile2="../conf/kot.conf";
+my $systemconfigfile='/usr/local/etc/utt/kot.conf';
+my $userconfigfile="$ENV{'HOME'}/.utt/kot.conf";
 
 #read configuration files###########################
 my $file;
-foreach $file ($configfile1, $configfile2){
+foreach $file ($systemconfigfile, $userconfigfile){
   if(open(CONFIG, $file)){
   	while (<CONFIG>) {
-  		chomp;                  
-      		s/#.*//;                
-	      	s/^\s+//;               
-      		s/\s+$//;               
-    		next unless length;     
+  		chomp;
+      		s/#.*//;
+	      	s/^\s+//;
+      		s/\s+$//;
+    		next unless length;
     		my ($name, $value) = split(/\s*=\s*/, $_, 2);
     		if(($name eq "gap-fill")or($name eq "g")){
@@ -31,6 +31,6 @@
 			$help=1;
     		}
-    	
-	} 
+
+	}
   	close CONFIG;
   }
@@ -49,5 +49,5 @@
 Options:
    --gap-fill -g                  Help.
-   --spaces -r                    
+   --spaces -r
    --define=FILE                  Read macrodefinitions from FILE.
    --flex-template=FILE           Read flex code template from FILE.
@@ -71,5 +71,5 @@
 {
     my ($start,$len,$type,$form) = /^\s*(\d+)\s+(\d+)\s+(\S+)\s+(\S+)/;
-    
+
     if($start > $prevend)
     {
@@ -78,5 +78,5 @@
 
     $prevend=$start+$len;
-    
+
     next if $len==0;# || $form eq "*";
 
@@ -94,6 +94,2 @@
     print $form;
 }
-
-#print $gap_fill;
-
-# print "\n";
Index: app/src/tok/tok
===================================================================
--- app/src/tok/tok	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/tok/tok	(revision 246900abc92b7d822ca17bd69aeb06d2b30db588)
@@ -7,17 +7,17 @@
 my $help;
 
-my $configfile1=".../../conf/tok.conf";
-my $configfile2="../conf/tok.conf";
+my $systemconfigfile='/usr/local/etc/utt/tok.conf';
+my $userconfigfile="$ENV{'HOME'}/.utt/tok.conf";
 
 #read configuration files###########################
 my $file;
-foreach $file ($configfile1, $configfile2){
+foreach $file ($systemconfigfile, $userconfigfile){
 	if(open(CONFIG, $configfile1)){
 		while (<CONFIG>) {
-    			chomp;                  
-    			s/#.*//;                
-			s/^\s+//;               
-    			s/\s+$//;               
-    			next unless length;     
+    			chomp;
+    			s/#.*//;
+			s/^\s+//;
+    			s/\s+$//;
+    			next unless length;
     			my ($name, $value) = split(/\s*=\s*/, $_, 2);
     			if(($name eq "interactive")or($name eq "i")){
@@ -27,5 +27,5 @@
 				$help=1;
     			}
-		} 
+		}
 		close CONFIG;
 	}
@@ -56,5 +56,5 @@
 while(<>)
 {
-    1 while  
+    1 while
 	/ [[:alpha:]]+   (?{seg('W',$&)})
 	| \d+            (?{seg('N',$&)})
@@ -96,3 +96,2 @@
     $offset += $len;
 }
-