diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java
index 3274cf1a..f0cae40e 100644
--- a/trunk/siprp/Main.java
+++ b/trunk/siprp/Main.java
@@ -47,7 +47,8 @@ public class Main implements Connector
 //		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_combo.jpg" );
 //		Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.TRUE );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp" );
-		new SIPRPDataLoader().load();
+//		new SIPRPDataLoader().load();
+		new ClinicaAvenidaDataLoader().load();
 		
 		dbase = (String)Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME );
 /*		Calendar cal = Calendar.getInstance();
@@ -85,11 +86,11 @@ public class Main implements Connector
 		avisos = new AvisosPanel();
 		String logoFileName = ( String ) Singleton.getInstance( SingletonConstants.COMPANY_LOGO );
 		LoginWindow loginWindow = new LoginWindow( new Main(), /*"logo"+File.separator +*/ logoFileName,//"logo"+File.separator + "logo_w400.jpg", 
-				new String[] { "SIPRPSoft" }, 
+				new String[] { (String) Singleton.getInstance( SingletonConstants.SOFTWARE_NAME ) }, 
 				new String[] { "Vers\u00E3o 2.0", "(EVOLUTE 2004)" }, "",
 				(String)Singleton.getInstance( SingletonConstants.LOCAL_USER ), 
 				(String)Singleton.getInstance( SingletonConstants.LOCAL_PASSWORD ), avisos, false );
-		loginWindow.setTitle( "SIPRPSoft" );
+		loginWindow.setTitle( (String) Singleton.getInstance( SingletonConstants.SOFTWARE_NAME ) );
 		JPanel left = loginWindow.getLeftPanel();
 		left.setBackground( Color.white );
 		loginWindow.show();
diff --git a/trunk/siprp/SIPRPTracker.java b/trunk/siprp/SIPRPTracker.java
index 4c40cc88..7a364ba5 100644
--- a/trunk/siprp/SIPRPTracker.java
+++ b/trunk/siprp/SIPRPTracker.java
@@ -10,8 +10,10 @@ import javax.swing.*;
 import javax.swing.tree.*;
 import java.util.*;
 
+import com.evolute.utils.*;
 import com.evolute.utils.tracker.*;
 
+import siprp.*;
 import siprp.ficha.*;
 import siprp.clientes.*;
 import siprp.estatistica.*;
@@ -36,40 +38,61 @@ public class SIPRPTracker extends WindowTracker
 		this.avisos = avisosP;
 		avisos.setTracker( this );
 		Hashtable creators = new Hashtable();
-		DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode( "SIPRP" );
+		DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode( 
+			Singleton.getInstance( SingletonConstants.COMPANY_ACRONYM ) );
 		
-		try
+		boolean hasFicha = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_FICHA ) ).booleanValue();
+		boolean hasGestao = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_CLIENTES ) ).booleanValue();
+		boolean hasRelatorio = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_RELATORIO ) ).booleanValue();
+		boolean hasListagens = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_LISTAGENS ) ).booleanValue();
+		
+		if( hasGestao )
 		{
-			clientesWindow = new ClientesWindow( avisos );
+			try
+			{
+				clientesWindow = new ClientesWindow( avisos );
+			}
+			catch( Exception ex )
+			{
+				clientesWindow = null;
+				ex.printStackTrace();
+			}
 		}
-		catch( Exception ex )
+		else
 		{
 			clientesWindow = null;
-			ex.printStackTrace();
 		}
 		
-		rootNode.add( new DefaultMutableTreeNode( FICHA_APTIDAO ) );
-		creators.put( FICHA_APTIDAO, new WindowCreator() {
-				public TrackableWindow create()
-					throws Exception
-				{
-					return new FichaWindow();
-				}
-			} );
+		if( hasFicha )
+		{
+			rootNode.add( new DefaultMutableTreeNode( FICHA_APTIDAO ) );
+			creators.put( FICHA_APTIDAO, new WindowCreator() {
+					public TrackableWindow create()
+						throws Exception
+					{
+						return new FichaWindow();
+					}
+				} );
+		}
 		
-		rootNode.add( new DefaultMutableTreeNode( GESTAO_CLIENTES ) );
-		creators.put( GESTAO_CLIENTES, new WindowCreator() {
-				public TrackableWindow create()
-					throws Exception
-				{
-					if( clientesWindow == null )
+		if( hasGestao )
+		{
+			rootNode.add( new DefaultMutableTreeNode( GESTAO_CLIENTES ) );
+			creators.put( GESTAO_CLIENTES, new WindowCreator() {
+					public TrackableWindow create()
+						throws Exception
 					{
-						clientesWindow = new ClientesWindow( avisos );
+						if( clientesWindow == null )
+						{
+							clientesWindow = new ClientesWindow( avisos );
+						}
+						return clientesWindow;
 					}
-					return clientesWindow;
-				}
-			} );
-			
+				} );
+		}
+		
+		if( hasRelatorio )
+		{
 		rootNode.add( new DefaultMutableTreeNode( RELATORIO_ANUAL ) );
 		creators.put( RELATORIO_ANUAL, new WindowCreator() {
 				public TrackableWindow create()
@@ -78,15 +101,19 @@ public class SIPRPTracker extends WindowTracker
 					return new PesquisasWindow();
 				}
 			} );
+		}
 		
-		rootNode.add( new DefaultMutableTreeNode( LISTAGENS ) );
-		creators.put( LISTAGENS, new WindowCreator() {
-				public TrackableWindow create()
-					throws Exception
-				{
-					return new EstatisticaWindow();
-				}
-			} );
+		if( hasListagens )
+		{
+			rootNode.add( new DefaultMutableTreeNode( LISTAGENS ) );
+			creators.put( LISTAGENS, new WindowCreator() {
+					public TrackableWindow create()
+						throws Exception
+					{
+						return new EstatisticaWindow();
+					}
+				} );
+		}
 		setRoot( rootNode );
 		setCreators( creators );
 	}
diff --git a/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java b/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java
index f9387cab..6d67b02b 100644
--- a/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java
+++ b/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java
@@ -24,6 +24,7 @@ public class ClinicaAvenidaDataLoader implements CompanyDataLoader
 	
 	public void load()
 	{
+		Singleton.setInstance( SingletonConstants.SOFTWARE_NAME, "SHSTSoft" );
 		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Clínico Avenida" );
 		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" );
 		Singleton.setInstance( SingletonConstants.COMPANY_ACRONYM, "CCA" );
@@ -62,6 +63,9 @@ public class ClinicaAvenidaDataLoader implements CompanyDataLoader
 										+ "2700-419 Amadora\n"
 										+ "Tel.: 214928612" );
 		Singleton.setInstance( SingletonConstants.USES_HOUR, Boolean.TRUE );
+		Singleton.setInstance( SingletonConstants.CODIGO_EMPRESA_FORMAT, "T" );
+		Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.FALSE );
+		Singleton.setInstance( SingletonConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, 4, 5, 6, 9, 7, 8 } );
 		
 		Singleton.setInstance( SingletonConstants.MODULE_FICHA, Boolean.TRUE );
 		Singleton.setInstance( SingletonConstants.MODULE_CLIENTES, Boolean.TRUE );
@@ -76,12 +80,12 @@ public class ClinicaAvenidaDataLoader implements CompanyDataLoader
 		Singleton.setInstance( SingletonConstants.WEB_DB_NAME, "" );
 		Singleton.setInstance( SingletonConstants.WEB_DRIVER_NAME, "" );
 	
-		Singleton.setInstance( SingletonConstants.LOCAL_USER, "root" );
-		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "UNIXLuvsU" );
+		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
+		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
 		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
 		Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost" );
 		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "shst" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 	}
 	
 }