diff -Nur gcfilms-pre/bin/gcfilms gcfilms/bin/gcfilms
--- gcfilms-pre/bin/gcfilms	2005-06-26 17:28:53.000000000 +0200
+++ gcfilms/bin/gcfilms	2005-08-08 11:40:26.000000000 +0200
@@ -26,35 +26,28 @@
 use utf8;
 
 use File::Path;
-use FindBin qw($RealBin);
 use POSIX qw(locale_h);
 
-use lib "$RealBin/../lib/gcfilms";
+use lib qw(/usr/share/gcfilms/lib);
 
 #XDG stuff
 my $home = $ENV{'HOME'};
-$home =~ s/\\/\//g if ($^O =~ /win32/i);
 
-$ENV{XDG_CONFIG_HOME} = $RealBin.'/../config' if ($^O =~ /win32/i);
 $ENV{XDG_CONFIG_HOME} = $home.'/.config' if ! exists $ENV{XDG_CONFIG_HOME};
 mkpath $ENV{XDG_CONFIG_HOME};
 
-$ENV{XDG_DATA_HOME} = $RealBin.'/../data' if ($^O =~ /win32/i);
 $ENV{XDG_DATA_HOME} = $home.'/.local/share' if ! exists $ENV{XDG_DATA_HOME};
 mkpath $ENV{XDG_DATA_HOME};
 
 $ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME}.'/gcfilms';
-$ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME} if ($^O =~ /win32/i);
 mkdir $ENV{GCF_CONFIG_HOME};
 $ENV{GCF_CONFIG_FILE} = $ENV{GCF_CONFIG_HOME}.'/gcfilms.conf';
 $ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME}.'/gcfilms';
-$ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME} if ($^O =~ /win32/i);
 mkdir $ENV{GCF_DATA_HOME};
 
-$ENV{GCF_BIN_DIR} = $RealBin;
-($ENV{GCF_LIB_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/lib\/gcfilms/;
-
-($ENV{GCF_SHARE_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/share\/gcfilms/;
+$ENV{GCF_BIN_DIR} = '/usr/bin';
+$ENV{GCF_LIB_DIR} = '/usr/share/gcfilms/lib';
+$ENV{GCF_SHARE_DIR} = '/usr/share/gcfilms';
 
 my $options = new GCOptionLoader($ENV{GCF_CONFIG_FILE});
                
diff -Nur gcfilms-pre/lib/gcfilms/GCExport/GCExportBase.pm gcfilms/lib/gcfilms/GCExport/GCExportBase.pm
--- gcfilms-pre/lib/gcfilms/GCExport/GCExportBase.pm	2005-07-22 15:29:09.000000000 +0200
+++ gcfilms/lib/gcfilms/GCExport/GCExportBase.pm	2005-08-08 11:40:26.000000000 +0200
@@ -29,11 +29,6 @@
     use File::Basename;
     use File::Copy;
     
-    if ($^O =~ /win32/i)
-    {
-        use File::DosGlob 'glob';
-    }
-    
     #Methods to be overriden in specific classes
     
     sub new
diff -Nur gcfilms-pre/lib/gcfilms/GCExport.pm gcfilms/lib/gcfilms/GCExport.pm
--- gcfilms-pre/lib/gcfilms/GCExport.pm	2005-04-07 19:18:45.000000000 +0200
+++ gcfilms/lib/gcfilms/GCExport.pm	2005-08-08 11:40:26.000000000 +0200
@@ -25,17 +25,13 @@
 use strict;
 
 use File::Basename;
-use FindBin qw($RealBin);
 
 use base 'Exporter';
 our @EXPORT = qw(@exportersArray);
 
 our @exportersArray;
 
-use Cwd;
-my $oldCwd = getcwd;
-chdir $RealBin;
-foreach (glob "../lib/gcfilms/GCExport/*.pm")
+foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm")
 {
     my $export = basename($_, '.pm')."\n";
     next if $export =~ /GCExportBase/;
@@ -46,7 +42,6 @@
     die "Fatal error with exporter $export\n$@" if $@;
     push @exportersArray, $obj if ! $obj->{errors};
 }
-chdir $oldCwd;
 
 use Gtk2;
 use GCDialogs;
diff -Nur gcfilms-pre/lib/gcfilms/GCImport.pm gcfilms/lib/gcfilms/GCImport.pm
--- gcfilms-pre/lib/gcfilms/GCImport.pm	2005-04-10 14:24:33.000000000 +0200
+++ gcfilms/lib/gcfilms/GCImport.pm	2005-08-08 11:40:26.000000000 +0200
@@ -23,17 +23,13 @@
 ###################################################
 
 use File::Basename;
-use FindBin qw($RealBin);
 
 use base 'Exporter';
 our @EXPORT = qw(@importersArray);
 
 our @importersArray;
 
-use Cwd;
-my $oldCwd = getcwd;
-chdir $RealBin;
-foreach (glob "../lib/gcfilms/GCImport/*.pm")
+foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm")
 {
     my $import = basename($_, '.pm')."\n";
     next if $import =~ /GCImportBase/;
@@ -44,7 +40,6 @@
     die "Fatal error with importer $import\n$@" if $@;
     push @importersArray, $obj if ! $obj->{errors};
 }
-chdir $oldCwd;
 
 use Gtk2;
 use GCDialogs;
diff -Nur gcfilms-pre/lib/gcfilms/GCLang.pm gcfilms/lib/gcfilms/GCLang.pm
--- gcfilms-pre/lib/gcfilms/GCLang.pm	2005-06-11 14:18:36.000000000 +0200
+++ gcfilms/lib/gcfilms/GCLang.pm	2005-08-08 11:40:26.000000000 +0200
@@ -29,19 +29,10 @@
 	our @EXPORT = qw(%langs @langsNames);
 
     use File::Basename;
-    use FindBin qw($RealBin $Script);
-
-    my $baseDir = $RealBin;
-    $baseDir .= '/bin' if $Script =~ m/install$/;
-    $baseDir = '..' if $Script eq '-e';
-    
     our %langs;
 
-    use Cwd;
-    my $oldCwd = getcwd;
-    chdir $baseDir;
-    use lib '../lib/gcfilms/';
-    foreach (glob "../lib/gcfilms/GCLang/*.pm")
+    use lib '/usr/share/gcfilms/lib';
+    foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm")
     {
         my $lang = basename($_, '.pm');
         eval "use GCLang::$lang";
@@ -49,7 +40,6 @@
         eval "%tmpLang = %GCLang::${lang}::lang";
         $langs{$lang} = \%tmpLang;
     }
-    chdir $oldCwd;
     our @langsNames;
     foreach (keys %langs)
     {
diff -Nur gcfilms-pre/lib/gcfilms/GCMainWindow.pm gcfilms/lib/gcfilms/GCMainWindow.pm
--- gcfilms-pre/lib/gcfilms/GCMainWindow.pm	2005-07-20 19:46:17.000000000 +0200
+++ gcfilms/lib/gcfilms/GCMainWindow.pm	2005-08-08 11:40:26.000000000 +0200
@@ -125,11 +125,6 @@
     package GCFrame;
     use base "Gtk2::Window";
 
-    if ($^O =~ /win32/i)
-    {
-        use File::DosGlob 'glob';
-    }
-
     use GCMoviesLists;
     use GCPlugins;
     use GCGraphicComponents;
diff -Nur gcfilms-pre/lib/gcfilms/GCOptions.pm gcfilms/lib/gcfilms/GCOptions.pm
--- gcfilms-pre/lib/gcfilms/GCOptions.pm	2005-07-14 16:39:08.000000000 +0200
+++ gcfilms/lib/gcfilms/GCOptions.pm	2005-08-08 11:40:26.000000000 +0200
@@ -65,7 +65,7 @@
             open OPTIONS, ">$file" or $self->{parent}->optionsError('create');
             printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/
 autosave=1
-browser=firefox
+browser=mozilla-firefox
 file='.$ENV{GCF_DATA_HOME}.'/films.gcf
 order==0
 split=300
diff -Nur gcfilms-pre/lib/gcfilms/GCPlugins.pm gcfilms/lib/gcfilms/GCPlugins.pm
--- gcfilms-pre/lib/gcfilms/GCPlugins.pm	2005-06-30 22:51:37.000000000 +0200
+++ gcfilms/lib/gcfilms/GCPlugins.pm	2005-08-08 11:40:26.000000000 +0200
@@ -26,18 +26,13 @@
     use strict;
     
     use File::Basename;
-    use FindBin qw($RealBin);
 
  	use base 'Exporter';
 	our @EXPORT = qw(%pluginsMap @pluginsNameArray);
 
     our %pluginsMap;
 
-    use Cwd;
-    my $oldCwd = getcwd;
-    chdir $RealBin;
-
-    foreach (glob "../lib/gcfilms/GCPlugins/*.pm")
+    foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm")
     {
         my $plugin = basename($_, '.pm')."\n";
         next if $plugin =~ /GCPluginsBase/;
@@ -49,7 +44,6 @@
         #push @pluginsArray, $obj;
         $pluginsMap{$obj->getName} = $obj;
     }
-    chdir $oldCwd;
 
     our @pluginsNameArray = sort keys %pluginsMap;
     
diff -Nur gcfilms-pre/lib/gcfilms/GCStyle.pm gcfilms/lib/gcfilms/GCStyle.pm
--- gcfilms-pre/lib/gcfilms/GCStyle.pm	2005-04-04 23:08:15.000000000 +0200
+++ gcfilms/lib/gcfilms/GCStyle.pm	2005-08-08 11:40:26.000000000 +0200
@@ -28,19 +28,15 @@
     use base 'Exporter';
 	our @EXPORT = qw(%styles);
 
-    use FindBin qw($RealBin);
     use File::Basename;
     our %styles;
 
-    use Cwd;
-    my $oldCwd = getcwd;
-    chdir $RealBin;
-    foreach (glob "../share/gcfilms/style/*")
+    foreach (glob "/usr/share/gcfilms/*")
     {
         my $style = basename($_);
         next if $style eq 'CVS';
         my %tmpStyle;
-        $tmpStyle{dir} = $RealBin.'/'.$_;
+        $tmpStyle{dir} = $_;
         $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc';
         $tmpStyle{name} = $style;
         $styles{$style} = \%tmpStyle;
@@ -49,8 +45,6 @@
 #    $tmpStyle{dir} = '';
 #    $tmpStyle{name} = 'Gtk';
 #    $styles{Gtk} = \%tmpStyle;
-    
-    chdir $oldCwd;
 }
 
 1;